From b2038e201cf13dd7a39ccd117e2759eab96c26ca Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 18 Mar 2025 20:18:10 -0500 Subject: [PATCH] player location sync --- src/engine/gameManager/MovementManager.java | 8 -------- src/engine/gameManager/PowersManager.java | 11 ++++++++--- src/engine/objects/PlayerCharacter.java | 1 - 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/engine/gameManager/MovementManager.java b/src/engine/gameManager/MovementManager.java index 52fa09b0..017b5f06 100644 --- a/src/engine/gameManager/MovementManager.java +++ b/src/engine/gameManager/MovementManager.java @@ -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); diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index e039956e..875e509f 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -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 { 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; diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 2559fb68..9cae8e78 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -5369,7 +5369,6 @@ public class PlayerCharacter extends AbstractCharacter { if (!this.isMoving()) { - this.teleport(this.loc); return; }