Browse Source

Merge remote-tracking branch 'origin/refinement-fix' into post-wipe-merge

master
MagicBot 2 years ago
parent
commit
5a19507f53
  1. 1
      src/engine/net/client/msg/RefineMsg.java
  2. 2
      src/engine/net/client/msg/TrainMsg.java
  3. 2
      src/engine/objects/PlayerCharacter.java

1
src/engine/net/client/msg/RefineMsg.java

@ -168,6 +168,7 @@ public class RefineMsg extends ClientNetMsg { @@ -168,6 +168,7 @@ public class RefineMsg extends ClientNetMsg {
RefinerScreenMsg refinerScreenMsg = new RefinerScreenMsg(skillPower, npc.getSellPercent(pc)); //TODO set npc cost
dispatch = Dispatch.borrow(pc, refinerScreenMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, engine.Enum.DispatchChannel.SECONDARY);
pc.recalculate();
}
}

2
src/engine/net/client/msg/TrainMsg.java

@ -108,7 +108,7 @@ public class TrainMsg extends ClientNetMsg { @@ -108,7 +108,7 @@ public class TrainMsg extends ClientNetMsg {
}
public static void train(TrainMsg msg, ClientConnection origin) throws MsgSendException {
origin.getPlayerCharacter().recalculate();
PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin);
Dispatch dispatch;

2
src/engine/objects/PlayerCharacter.java

@ -1302,7 +1302,6 @@ public class PlayerCharacter extends AbstractCharacter { @@ -1302,7 +1302,6 @@ public class PlayerCharacter extends AbstractCharacter {
this.calculateSkills();
return true;
}
public boolean refineSpi() {
boolean worked = false;
short newSpi = (short) 0;
@ -1357,6 +1356,7 @@ public class PlayerCharacter extends AbstractCharacter { @@ -1357,6 +1356,7 @@ public class PlayerCharacter extends AbstractCharacter {
}
}
}
return true;
}

Loading…
Cancel
Save