diff --git a/src/engine/InterestManagement/InterestManager.java b/src/engine/InterestManagement/InterestManager.java index 984a364c..9570367c 100644 --- a/src/engine/InterestManagement/InterestManager.java +++ b/src/engine/InterestManagement/InterestManager.java @@ -468,7 +468,12 @@ public enum InterestManager implements Runnable { continue; awonpc.playerAgroMap.put(player.getObjectUUID(), 0f); - ((Mob) awonpc).setCombatTarget(null); + + // siege engines keep firing at their target when a new player loads them + + if (!awonpc.isSiege()) + ((Mob) awonpc).setCombatTarget(null); + lcm = new LoadCharacterMsg(awonpc, PlayerCharacter.hideNonAscii()); } else if ((awo.getObjectTypeMask() & MBServerStatics.MASK_NPC) != 0) {