diff --git a/src/engine/InterestManagement/InterestManager.java b/src/engine/InterestManagement/InterestManager.java index e341637e..e44da878 100644 --- a/src/engine/InterestManagement/InterestManager.java +++ b/src/engine/InterestManagement/InterestManager.java @@ -46,7 +46,6 @@ public enum InterestManager implements Runnable { LoadCharacterMsg lcm; NPC npc; Corpse corpse; - PlayerCharacter pc; HashSet toUpdate; switch (awo.getObjectType()) { @@ -65,11 +64,6 @@ public enum InterestManager implements Runnable { lcm = new LoadCharacterMsg(npc, false); msg = lcm; break; - case PlayerCharacter: - pc = (PlayerCharacter) awo; - lcm = new LoadCharacterMsg(pc, false); - msg = lcm; - break; default: return; } @@ -112,7 +106,7 @@ public enum InterestManager implements Runnable { origin.sendMsg(moveMsg); } - public static void reloadCharacter(AbstractCharacter absChar, boolean fromBox) { + public static void reloadCharacter(AbstractCharacter absChar) { UnloadObjectsMsg uom = new UnloadObjectsMsg(); uom.addObject(absChar); @@ -138,9 +132,8 @@ public enum InterestManager implements Runnable { if (cc == null) continue; - if (pcc.getObjectUUID() == absChar.getObjectUUID()) { + if (pcc.getObjectUUID() == absChar.getObjectUUID()) continue; - } else { if (pc != null) @@ -538,7 +531,6 @@ public enum InterestManager implements Runnable { // Update loaded upbjects lists player.isBoxed = PlayerCharacter.checkIfBoxed(player); - //player.updateBoxStatus(PlayerCharacter.checkIfBoxed(player)); player.setDirtyLoad(true); updateStaticList(player, origin); updateMobileList(player, origin); diff --git a/src/engine/devcmd/cmds/SetAdminRuneCmd.java b/src/engine/devcmd/cmds/SetAdminRuneCmd.java index 396a08b7..f8df7016 100644 --- a/src/engine/devcmd/cmds/SetAdminRuneCmd.java +++ b/src/engine/devcmd/cmds/SetAdminRuneCmd.java @@ -62,7 +62,7 @@ public class SetAdminRuneCmd extends AbstractDevCmd { if (worked) { ChatManager.chatSayInfo(pcSender, "rune of ID " + runeID + " removed"); - InterestManager.reloadCharacter(pcSender, false); + InterestManager.reloadCharacter(pcSender); } else throwbackError(pcSender, "Failed to remove the rune of type " + runeID); diff --git a/src/engine/devcmd/cmds/SetBaseClassCmd.java b/src/engine/devcmd/cmds/SetBaseClassCmd.java index fa58f40b..be99f8de 100644 --- a/src/engine/devcmd/cmds/SetBaseClassCmd.java +++ b/src/engine/devcmd/cmds/SetBaseClassCmd.java @@ -47,7 +47,7 @@ public class SetBaseClassCmd extends AbstractDevCmd { this.setTarget(pc); //for logging ChatManager.chatSayInfo(pc, "BaseClass changed to " + classID); - InterestManager.reloadCharacter(pc, false); + InterestManager.reloadCharacter(pc); } diff --git a/src/engine/devcmd/cmds/SetLevelCmd.java b/src/engine/devcmd/cmds/SetLevelCmd.java index 4276a5fb..faf16164 100644 --- a/src/engine/devcmd/cmds/SetLevelCmd.java +++ b/src/engine/devcmd/cmds/SetLevelCmd.java @@ -57,7 +57,7 @@ public class SetLevelCmd extends AbstractDevCmd { tar.setLevel((short) level); this.setTarget(tar); //for logging ChatManager.chatSayInfo(pc, tar.getFirstName() + " level changed to " + level); - InterestManager.reloadCharacter(tar, false); + InterestManager.reloadCharacter(tar); } @Override diff --git a/src/engine/devcmd/cmds/SetPromotionClassCmd.java b/src/engine/devcmd/cmds/SetPromotionClassCmd.java index 915b0047..f8776786 100644 --- a/src/engine/devcmd/cmds/SetPromotionClassCmd.java +++ b/src/engine/devcmd/cmds/SetPromotionClassCmd.java @@ -42,7 +42,7 @@ public class SetPromotionClassCmd extends AbstractDevCmd { pc.setPromotionClass(classID); ChatManager.chatSayInfo(pc, "PromotionClass changed to " + classID); - InterestManager.reloadCharacter(pc, false); + InterestManager.reloadCharacter(pc); this.setTarget(pc); //for logging diff --git a/src/engine/devcmd/cmds/SetRuneCmd.java b/src/engine/devcmd/cmds/SetRuneCmd.java index 70ee598c..1379ab35 100644 --- a/src/engine/devcmd/cmds/SetRuneCmd.java +++ b/src/engine/devcmd/cmds/SetRuneCmd.java @@ -57,7 +57,7 @@ public class SetRuneCmd extends AbstractDevCmd { if (worked) { ChatManager.chatSayInfo(pcSender, "rune of ID " + runeID + " removed"); - InterestManager.reloadCharacter(pcSender, false); + InterestManager.reloadCharacter(pcSender); } else throwbackError(pcSender, "Failed to remove the rune of type " + runeID); diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 75859b70..28600640 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -5270,14 +5270,11 @@ public class PlayerCharacter extends AbstractCharacter { public static void updateLoadedPlayers(PlayerCharacter pc){ HashSet inRange = WorldGrid.getObjectsInRangePartial(pc.loc,MBServerStatics.CHARACTER_LOAD_RANGE,MBServerStatics.MASK_PLAYER); for(AbstractWorldObject awo : inRange){ - if(pc.loadedObjects.contains(awo)) - continue; PlayerCharacter toLoad = (PlayerCharacter)awo; if(toLoad.hidden > pc.seeInvis) continue; LoadCharacterMsg lcm = new LoadCharacterMsg(toLoad, PlayerCharacter.hideNonAscii()); pc.getClientConnection().sendMsg(lcm); - pc.loadedObjects.add(toLoad); } } public static boolean checkIfBoxed(PlayerCharacter player){