Browse Source

player location sync

lakebane
FatBoy-DOTC 2 weeks ago
parent
commit
b2038e201c
  1. 8
      src/engine/gameManager/MovementManager.java
  2. 11
      src/engine/gameManager/PowersManager.java
  3. 1
      src/engine/objects/PlayerCharacter.java

8
src/engine/gameManager/MovementManager.java

@ -66,14 +66,6 @@ public enum MovementManager { @@ -66,14 +66,6 @@ public enum MovementManager {
if (!toMove.isAlive())
return;
if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) {
if (((PlayerCharacter) toMove).isCasting()) {
((PlayerCharacter) toMove).updateLocation();
((PlayerCharacter) toMove).updateMovementState();
}
}
toMove.setIsCasting(false);
toMove.setItemCasting(false);

11
src/engine/gameManager/PowersManager.java

@ -169,6 +169,9 @@ public enum PowersManager { @@ -169,6 +169,9 @@ public enum PowersManager {
if(pc == null)
return;
if(pc.getRecycleTimers().containsKey(msg.getPowerUsedID())) {
return;
}
if(!pc.isFlying() && powersBaseByToken.get(msg.getPowerUsedID()) != null && powersBaseByToken.get(msg.getPowerUsedID()).isSpell) //cant be sitting if flying
CombatManager.toggleSit(false,origin);
@ -244,9 +247,11 @@ public enum PowersManager { @@ -244,9 +247,11 @@ public enum PowersManager {
if (playerCharacter == null)
return false;
if(playerCharacter.getRecycleTimers().containsKey(msg.getPowerUsedID())){
return false;
}
//if(playerCharacter.getRecycleTimers().containsKey(msg.getPowerUsedID())){
// playerCharacter.setIsCasting(false);
// playerCharacter.setItemCasting(false);
// return false;
//}
boolean CSRCast = false;

1
src/engine/objects/PlayerCharacter.java

@ -5369,7 +5369,6 @@ public class PlayerCharacter extends AbstractCharacter { @@ -5369,7 +5369,6 @@ public class PlayerCharacter extends AbstractCharacter {
if (!this.isMoving()) {
this.teleport(this.loc);
return;
}

Loading…
Cancel
Save