From 5d367a737cec3d8c9fff52e7d9f80f7f7769ee1a Mon Sep 17 00:00:00 2001 From: MagicBot Date: Thu, 28 Mar 2024 05:39:54 -0400 Subject: [PATCH] More itembase refactor --- src/engine/objects/CharacterItemManager.java | 23 -------------------- 1 file changed, 23 deletions(-) diff --git a/src/engine/objects/CharacterItemManager.java b/src/engine/objects/CharacterItemManager.java index 7d285e0f..bf452bbc 100644 --- a/src/engine/objects/CharacterItemManager.java +++ b/src/engine/objects/CharacterItemManager.java @@ -1430,7 +1430,6 @@ public class CharacterItemManager { public synchronized boolean buyFromNPC(Item purchasedItem, NPC npc) { CharacterItemManager itemMan; - ItemBase itemBase; if (purchasedItem == null || npc == null) return false; @@ -1440,7 +1439,6 @@ public class CharacterItemManager { if (itemMan == null) return false; - synchronized (this) { synchronized (itemMan) { ItemTemplate template = purchasedItem.template; @@ -1661,27 +1659,6 @@ public class CharacterItemManager { return this.account.getVault().contains(i); } - public synchronized boolean vaultContainsType(ItemBase ib) { - if (ib.getUUID() == 7) - return (this.getGoldVault() != null); - for (Item i : vault) { - if (i.getItemBase().getUUID() == ib.getUUID()) - return true; - } - return false; - } - - //for calling from devCmd fill vault. Already synchronized - public boolean vaultContainsTypeA(ItemBase ib) { - if (ib.getUUID() == 7) - return (this.getGoldVault() != null); - for (Item i : vault) { - if (i.getItemBase().getUUID() == ib.getUUID()) - return true; - } - return false; - } - public synchronized boolean equippedContains(Item i) { return equipped.containsValue(i); }