From c8d355636b5cf659932c9e54ab2df7f120ee276a Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 18 Mar 2024 12:47:55 -0400 Subject: [PATCH] Only one item manager --- src/engine/objects/AbstractCharacter.java | 2 +- src/engine/objects/Mob.java | 2 -- src/engine/objects/NPC.java | 2 -- src/engine/objects/PlayerCharacter.java | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/engine/objects/AbstractCharacter.java b/src/engine/objects/AbstractCharacter.java index 81c8303d..5588c688 100644 --- a/src/engine/objects/AbstractCharacter.java +++ b/src/engine/objects/AbstractCharacter.java @@ -49,7 +49,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; public abstract class AbstractCharacter extends AbstractWorldObject { - public CharacterItemManager charItemManager; + public CharacterItemManager charItemManager = new CharacterItemManager(this); private final ReentrantReadWriteLock healthLock = new ReentrantReadWriteLock(); public short level; public AbstractWorldObject combatTarget; diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java index a9cc26d4..9cd79f1c 100644 --- a/src/engine/objects/Mob.java +++ b/src/engine/objects/Mob.java @@ -1542,8 +1542,6 @@ public class Mob extends AbstractIntelligenceAgent implements Delayed { if (ConfigManager.serverType.equals(ServerType.LOGINSERVER)) return; - this.charItemManager = new CharacterItemManager(this); - this.mobBase = MobBase.getMobBase(loadID); this.building = BuildingManager.getBuilding(this.buildingUUID); diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java index 097c050a..6e7b3c62 100644 --- a/src/engine/objects/NPC.java +++ b/src/engine/objects/NPC.java @@ -814,8 +814,6 @@ public class NPC extends AbstractCharacter { @Override public void runAfterLoad() { - this.charItemManager = new CharacterItemManager(this); - if (ConfigManager.serverType.equals(ServerType.LOGINSERVER)) return; diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 1fa8c33a..5aca39d3 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -211,8 +211,6 @@ public class PlayerCharacter extends AbstractCharacter { super(rs, true); - this.charItemManager = new CharacterItemManager(this); - this.runes = DbManager.CharacterRuneQueries.GET_RUNES_FOR_CHARACTER(this.getObjectUUID()); int accountID = rs.getInt("parent"); this.account = DbManager.AccountQueries.GET_ACCOUNT(accountID);