diff --git a/src/engine/db/handlers/dbItemHandler.java b/src/engine/db/handlers/dbItemHandler.java index eb486994..4ca38eaf 100644 --- a/src/engine/db/handlers/dbItemHandler.java +++ b/src/engine/db/handlers/dbItemHandler.java @@ -325,7 +325,7 @@ public class dbItemHandler extends dbHandlerBase { for (Item item : inventory) { - if (item.template.item_type.equals(ItemType.GOLD)) + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) continue; try (Connection connection = DbManager.getConnection(); @@ -474,7 +474,7 @@ public class dbItemHandler extends dbHandlerBase { */ public boolean UPDATE_GOLD(final Item item, int newValue, int oldValue) { - if (!item.template.item_type.equals(ItemType.GOLD)) + if (!item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) return false; try (Connection connection = DbManager.getConnection(); diff --git a/src/engine/devcmd/cmds/MakeItemCmd.java b/src/engine/devcmd/cmds/MakeItemCmd.java index 94f68e3b..a3bad508 100644 --- a/src/engine/devcmd/cmds/MakeItemCmd.java +++ b/src/engine/devcmd/cmds/MakeItemCmd.java @@ -69,7 +69,7 @@ public class MakeItemCmd extends AbstractDevCmd { return; } - if (template.item_type == ItemType.GOLD) { + if (template.cacheTemplate.getItemType() == ItemType.GOLD) { this.throwbackInfo(pc, "use /addgold to add gold."); return; } @@ -139,8 +139,8 @@ public class MakeItemCmd extends AbstractDevCmd { } if ((numItems > 1) - && (template.item_type.equals(ItemType.RESOURCE) == false) - && (template.item_type.equals(ItemType.OFFERING)) == false) + && (template.cacheTemplate.getItemType().equals(ItemType.RESOURCE) == false) + && (template.cacheTemplate.getItemType().equals(ItemType.OFFERING)) == false) numItems = 1; CharacterItemManager cim = pc.charItemManager; diff --git a/src/engine/devcmd/cmds/PrintInventoryCmd.java b/src/engine/devcmd/cmds/PrintInventoryCmd.java index 1aa420f2..38cfa5cd 100644 --- a/src/engine/devcmd/cmds/PrintInventoryCmd.java +++ b/src/engine/devcmd/cmds/PrintInventoryCmd.java @@ -77,7 +77,7 @@ public class PrintInventoryCmd extends AbstractDevCmd { for (Item item : inventory) { ItemTemplate template = ItemTemplate.templates.get(item.templateID); - if (item.template.item_type.equals(ItemType.GOLD) == false) { + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD) == false) { String chargeInfo = ""; int chargeMax = template.item_initial_charges; diff --git a/src/engine/devcmd/cmds/SimulateBootyCmd.java b/src/engine/devcmd/cmds/SimulateBootyCmd.java index a91990b2..92b49eb2 100644 --- a/src/engine/devcmd/cmds/SimulateBootyCmd.java +++ b/src/engine/devcmd/cmds/SimulateBootyCmd.java @@ -57,7 +57,7 @@ public class SimulateBootyCmd extends AbstractDevCmd { try { mob.loadInventory(); for (Item lootItem : mob.charItemManager.getInventory()) { - switch (lootItem.template.item_type) { + switch (lootItem.template.cacheTemplate.getItemType()) { case EMPLOYMENTCONTRACT: //CONTRACT Contracts.add(lootItem); break; diff --git a/src/engine/gameManager/ChatManager.java b/src/engine/gameManager/ChatManager.java index 658fb215..3145b029 100644 --- a/src/engine/gameManager/ChatManager.java +++ b/src/engine/gameManager/ChatManager.java @@ -535,7 +535,7 @@ public enum ChatManager { if (item != null) //Steal if (success) { String name = ""; - if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) + if (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD)) name = amount + " gold "; else { String vowels = "aeiou"; diff --git a/src/engine/gameManager/GroupManager.java b/src/engine/gameManager/GroupManager.java index b5f8e75d..e63658ef 100644 --- a/src/engine/gameManager/GroupManager.java +++ b/src/engine/gameManager/GroupManager.java @@ -307,7 +307,7 @@ public enum GroupManager { return false; } - if (!item.template.item_type.equals(mbEnums.ItemType.GOLD)) //only split goldItem + if (!item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD)) //only split goldItem return false; Group group = getGroup(pc); diff --git a/src/engine/gameManager/ItemManager.java b/src/engine/gameManager/ItemManager.java index aabebbdc..e5375a5e 100644 --- a/src/engine/gameManager/ItemManager.java +++ b/src/engine/gameManager/ItemManager.java @@ -112,7 +112,7 @@ public enum ItemManager { public static boolean isTwoHanded(Item item) { - if (!item.template.item_type.equals(mbEnums.ItemType.WEAPON)) + if (!item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.WEAPON)) return false; return item.template.item_eq_slots_and.contains(EnumSet.of(mbEnums.EquipSlotType.LHELD, mbEnums.EquipSlotType.RHELD)); @@ -120,7 +120,7 @@ public enum ItemManager { public static boolean isTwoHanded(ItemTemplate template) { - if (!template.item_type.equals(mbEnums.ItemType.WEAPON)) + if (!template.cacheTemplate.getItemType().equals(mbEnums.ItemType.WEAPON)) return false; return template.item_eq_slots_and.contains(EnumSet.of(mbEnums.EquipSlotType.LHELD, mbEnums.EquipSlotType.RHELD)); @@ -165,7 +165,7 @@ public enum ItemManager { (slot == mbEnums.EquipSlotType.RHELD && equipped.get(mbEnums.EquipSlotType.LHELD) != null))) return false; - if (item.template.item_type.equals(mbEnums.ItemType.WEAPON)) + if (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.WEAPON)) if (equipped.get(slot) != null && equipped.get(slot).equals(item) == false) return false; diff --git a/src/engine/gameManager/LootManager.java b/src/engine/gameManager/LootManager.java index 5413821c..f6e6a389 100644 --- a/src/engine/gameManager/LootManager.java +++ b/src/engine/gameManager/LootManager.java @@ -179,7 +179,7 @@ public enum LootManager { if (itemUUID == 0) return null; - if (ItemTemplate.templates.get(itemUUID).item_type.equals(mbEnums.ItemType.RESOURCE)) { + if (ItemTemplate.templates.get(itemUUID).cacheTemplate.getItemType().equals(mbEnums.ItemType.RESOURCE)) { int amount = ThreadLocalRandom.current().nextInt(tableRow.minSpawn, tableRow.maxSpawn + 1); return new MobLoot(mob, ItemTemplate.templates.get(itemUUID), amount, false); } diff --git a/src/engine/gameManager/NPCManager.java b/src/engine/gameManager/NPCManager.java index 640318a5..3dbea024 100644 --- a/src/engine/gameManager/NPCManager.java +++ b/src/engine/gameManager/NPCManager.java @@ -352,7 +352,7 @@ public enum NPCManager { int baseDef = guard.mobBase.getDefenseRating(); int armorDefense = 0; for (Item equipped : guard.charItemManager.equipped.values()) - if (equipped.template.item_type.equals(mbEnums.ItemType.ARMOR) || ItemManager.isShield(equipped.template)) + if (equipped.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.ARMOR) || ItemManager.isShield(equipped.template)) armorDefense += equipped.template.item_defense_rating; guard.defenseRating = dexterity + baseDef + armorDefense; } @@ -442,7 +442,7 @@ public enum NPCManager { return; for (Item equipped : mob.charItemManager.equipped.values()) { - if (equipped.template.item_type.equals(mbEnums.ItemType.ARMOR)) { + if (equipped.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.ARMOR)) { mob.resists.setResist(mbEnums.DamageType.SLASHING, mob.resists.getResist(mbEnums.DamageType.SLASHING, 0) + equipped.template.combat_attack_resist.get("SLASHING")); mob.resists.setResist(mbEnums.DamageType.CRUSHING, mob.resists.getResist(mbEnums.DamageType.CRUSHING, 0) + equipped.template.combat_attack_resist.get("CRUSHING")); mob.resists.setResist(mbEnums.DamageType.PIERCING, mob.resists.getResist(mbEnums.DamageType.PIERCING, 0) + equipped.template.combat_attack_resist.get("PIERCING")); diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index daecc368..64bcdee6 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -2255,12 +2255,12 @@ public enum PowersManager { if (pb.targetItem()) return true; // TODO add these checks later - else if (pb.targetArmor() && item.template.item_type.equals(ItemType.ARMOR)) + else if (pb.targetArmor() && item.template.cacheTemplate.getItemType().equals(ItemType.ARMOR)) return true; - else if (pb.targetJewelry() && item.template.item_type.equals(ItemType.JEWELRY)) + else if (pb.targetJewelry() && item.template.cacheTemplate.getItemType().equals(ItemType.JEWELRY)) return true; else - return pb.targetWeapon() && item.template.item_type.equals(ItemType.WEAPON); + return pb.targetWeapon() && item.template.cacheTemplate.getItemType().equals(ItemType.WEAPON); } // How did we get here? all valid targets have been covered else return false; diff --git a/src/engine/net/client/handlers/ItemProductionMsgHandler.java b/src/engine/net/client/handlers/ItemProductionMsgHandler.java index c36fb2af..7ce55950 100644 --- a/src/engine/net/client/handlers/ItemProductionMsgHandler.java +++ b/src/engine/net/client/handlers/ItemProductionMsgHandler.java @@ -238,7 +238,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler { if (targetItem == null) return; - if (targetItem.template.item_type.equals(ItemType.GOLD)) + if (targetItem.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) return; if (!vendor.charItemManager.hasRoomInventory(targetItem.template.item_wt)) { @@ -319,7 +319,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler { if (targetItem == null) continue; - if (targetItem.template.item_type.equals(ItemType.GOLD)) + if (targetItem.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) return; if (!vendor.charItemManager.doesCharOwnThisItem(targetItem.getObjectUUID())) @@ -335,7 +335,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler { break; } - switch (targetItem.template.item_type) { + switch (targetItem.template.cacheTemplate.getItemType()) { case EMPLOYMENTCONTRACT: case CHARTER: case DEED: @@ -465,7 +465,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler { if (targetItem == null) return; - if (targetItem.template.item_type.equals(ItemType.GOLD)) + if (targetItem.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) return; if (!vendor.charItemManager.inventoryContains(targetItem)) diff --git a/src/engine/net/client/handlers/LootMsgHandler.java b/src/engine/net/client/handlers/LootMsgHandler.java index b56fbefe..3efb2eaa 100644 --- a/src/engine/net/client/handlers/LootMsgHandler.java +++ b/src/engine/net/client/handlers/LootMsgHandler.java @@ -161,7 +161,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler { if (itemRet == null) return true; - if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD)) { // this is done to prevent the temporary goldItem item // (from the mob) from appearing in player's inventory. // It also updates the goldItem quantity display @@ -187,7 +187,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler { //TODO send group loot message if player is grouped and visible Group group = GroupManager.getGroup(player); - if (group != null && group.getSplitGold() && (item.template.item_type.equals(mbEnums.ItemType.GOLD) == false)) { + if (group != null && group.getSplitGold() && (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD) == false)) { String name = item.getName(); String text = player.getFirstName() + " has looted " + name + '.'; ChatManager.chatGroupInfoCanSee(player, text); @@ -202,7 +202,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler { if (itemRet == null) return true; - if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD)) { // this is done to prevent the temporary goldItem item // (from the mob) from appearing in player's inventory. // It also updates the goldItem quantity display @@ -241,7 +241,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler { //TODO send group loot message if player is grouped and visible Group group = GroupManager.getGroup(player); - if (group != null && group.getSplitGold() && (item.template.item_type.equals(mbEnums.ItemType.GOLD) == false)) { + if (group != null && group.getSplitGold() && (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD) == false)) { String name = item.getName(); String text = player.getFirstName() + " has looted " + name + '.'; ChatManager.chatGroupInfoCanSee(player, text); diff --git a/src/engine/net/client/handlers/ObjectActionMsgHandler.java b/src/engine/net/client/handlers/ObjectActionMsgHandler.java index 0ef50060..5fc91314 100644 --- a/src/engine/net/client/handlers/ObjectActionMsgHandler.java +++ b/src/engine/net/client/handlers/ObjectActionMsgHandler.java @@ -79,7 +79,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler { int uuid = item.templateID; - switch (item.template.item_type) { + switch (item.template.cacheTemplate.getItemType()) { case DEED: //buildings //Call add building screen here, ib.getUseID() get's building ID @@ -226,7 +226,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler { // Bypass for waterbuckets - if (item.template.item_type.equals(mbEnums.ItemType.BUCKET)) { + if (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.BUCKET)) { // test for valid target type if (target.getObjectType() == mbEnums.GameObjectType.PlayerCharacter) diff --git a/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java b/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java index 2f31b86c..1d3b12c4 100644 --- a/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java +++ b/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java @@ -68,7 +68,7 @@ public class TransferItemFromBankMsgHandler extends AbstractClientMsgHandler { return true; ; - if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD)) { if (!itemManager.moveGoldToInventory(item, msg.getNumItems())) return true; diff --git a/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java b/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java index c7043e98..8306b4a4 100644 --- a/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java +++ b/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java @@ -65,7 +65,7 @@ public class TransferItemToBankMsgHandler extends AbstractClientMsgHandler { return true; if (item.containerType == mbEnums.ItemContainerType.INVENTORY && itemManager.isBankOpen()) - if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD)) { if (!itemManager.moveGoldToBank(item, msg.getNumItems())) return true; UpdateGoldMsg goldMes = new UpdateGoldMsg(player); diff --git a/src/engine/net/client/msg/UpdateInventoryMsg.java b/src/engine/net/client/msg/UpdateInventoryMsg.java index b4aa8fc2..7aad9224 100644 --- a/src/engine/net/client/msg/UpdateInventoryMsg.java +++ b/src/engine/net/client/msg/UpdateInventoryMsg.java @@ -54,7 +54,7 @@ public class UpdateInventoryMsg extends ClientNetMsg { for (Item item : list) { - if (item.template.item_type.equals(ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) { if (item.getNumOfItems() == 0) continue; } diff --git a/src/engine/net/client/msg/VendorBuyWindowMsg.java b/src/engine/net/client/msg/VendorBuyWindowMsg.java index c9a6c222..1292d200 100644 --- a/src/engine/net/client/msg/VendorBuyWindowMsg.java +++ b/src/engine/net/client/msg/VendorBuyWindowMsg.java @@ -156,7 +156,7 @@ public class VendorBuyWindowMsg extends ClientNetMsg { for (Item item : inventory) { if (item.getOwnerID() != ownerID) continue; - if (item.template.item_type.equals(ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) { if (item.getNumOfItems() == 0) continue; } diff --git a/src/engine/objects/AbstractCharacter.java b/src/engine/objects/AbstractCharacter.java index 368cb8c2..0312630b 100644 --- a/src/engine/objects/AbstractCharacter.java +++ b/src/engine/objects/AbstractCharacter.java @@ -701,7 +701,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject { if (itemTemplate == null) noWeapon = true; - else if (!weapon.template.item_type.equals(ItemType.WEAPON)) { + else if (!weapon.template.cacheTemplate.getItemType().equals(ItemType.WEAPON)) { defaultAtrAndDamage(abstractCharacter, mainHand); return; } else @@ -718,7 +718,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject { if (noWeapon) { if (mainHand) { Item off = abstractCharacter.charItemManager.getEquipped().get(EquipSlotType.LHELD); - if (off != null && off.template != null && off.template.item_type.equals(ItemType.WEAPON)) + if (off != null && off.template != null && off.template.cacheTemplate.getItemType().equals(ItemType.WEAPON)) abstractCharacter.rangeHandOne = 10 * (1 + (abstractCharacter.statStrBase / 600)); // Set // to // no @@ -997,7 +997,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject { if (template == null) return 0; - if (!armor.template.item_type.equals(ItemType.ARMOR)) + if (!armor.template.cacheTemplate.getItemType().equals(ItemType.ARMOR)) return 0; if (armor.template.item_skill_used.isEmpty()) diff --git a/src/engine/objects/Account.java b/src/engine/objects/Account.java index 11cc8cf0..fdc5f5b3 100644 --- a/src/engine/objects/Account.java +++ b/src/engine/objects/Account.java @@ -172,7 +172,7 @@ public class Account extends AbstractGameObject { this.vault = DbManager.ItemQueries.GET_ITEMS_FOR_ACCOUNT(this.getObjectUUID()); for (Item item : this.vault) { - if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD)) { this.vaultGold = item; } } diff --git a/src/engine/objects/CharacterItemManager.java b/src/engine/objects/CharacterItemManager.java index 9ec15574..2618311d 100644 --- a/src/engine/objects/CharacterItemManager.java +++ b/src/engine/objects/CharacterItemManager.java @@ -130,19 +130,19 @@ public class CharacterItemManager { this.equipped.put(i.equipSlot, i); break; case BANK: - if (i.template.item_type.equals(ItemType.GOLD)) + if (i.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) this.goldBank = i; else if (this.bank.contains(i) == false) this.bank.add(i); break; case INVENTORY: - if (i.template.item_type.equals(ItemType.GOLD)) + if (i.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) this.goldInventory = i; else if (this.inventory.contains(i) == false) this.inventory.add(i); break; case VAULT: - if (i.template.item_type.equals(ItemType.GOLD)) + if (i.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) this.goldVault = i; else if (this.vault.contains(i) == false) this.vault.add(i); @@ -175,13 +175,13 @@ public class CharacterItemManager { this.equipped.put(i.equipSlot, i); break; case BANK: - if (i.template.item_type.equals(ItemType.GOLD)) + if (i.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) this.goldBank = i; else if (this.bank.contains(i) == false) this.bank.add(i); break; case INVENTORY: - if (i.template.item_type.equals(ItemType.GOLD)) + if (i.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) this.goldInventory = i; else if (this.inventory.contains(i) == false) this.inventory.add(i); @@ -511,7 +511,7 @@ public class CharacterItemManager { if (i == null) return false; - if (i.template.item_type.equals(ItemType.GOLD)) { + if (i.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) { if (this.getGoldInventory() != null) { if (i.getObjectUUID() == this.getGoldInventory().getObjectUUID()) this.goldInventory = null; @@ -541,7 +541,7 @@ public class CharacterItemManager { } private synchronized boolean junk(Item i, boolean updateInventory) { - if (i.template.item_type.equals(ItemType.GOLD)) { + if (i.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) { if (this.getGoldInventory().getObjectUUID() == i.getObjectUUID()) if (DbManager.ItemQueries.UPDATE_GOLD(i, 0)) { this.getGoldInventory().setNumOfItems(0); @@ -596,7 +596,7 @@ public class CharacterItemManager { if (equippedContains(item)) { fromEquip = true; - if (item.template.item_type.equals(ItemType.GOLD)) + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) this.absCharacter.cancelOnUnEquip(); } @@ -814,7 +814,7 @@ public class CharacterItemManager { // This removes ingame item from inventory for loot. private synchronized boolean removeItemFromInventory(Item i) { - if (i.template.item_type.equals(ItemType.GOLD)) { + if (i.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) { if (i.getObjectUUID() != this.getGoldInventory().getObjectUUID()) return false; if (!DbManager.ItemQueries.UPDATE_GOLD(this.goldInventory, 0)) { @@ -837,7 +837,7 @@ public class CharacterItemManager { // This adds item to inventory for loot. Validity checks already handled public synchronized boolean addItemToInventory(Item i) { - if (i.template.item_type.equals(ItemType.GOLD)) + if (i.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) if (this.absCharacter.getObjectType() == GameObjectType.Mob) { if (this.goldInventory == null) loadGoldItems(); @@ -1041,7 +1041,7 @@ public class CharacterItemManager { if (npc.getContractID() >= 1900 && npc.getContractID() <= 1906) eatItem = true; - if (itemToSell.template.item_type.equals(ItemType.POTION)) + if (itemToSell.template.cacheTemplate.getItemType().equals(ItemType.POTION)) eatItem = true; if (eatItem) { @@ -1184,9 +1184,9 @@ public class CharacterItemManager { synchronized (lockFirst) { synchronized (lockSecond) { // make sure current player has item in inventory - if (lootItem.template.item_type.equals(ItemType.GOLD) && lootItem.getObjectUUID() != this.getGoldInventory().getObjectUUID() && !(this.absCharacter.getObjectType().equals(GameObjectType.Mob))) + if (lootItem.template.cacheTemplate.getItemType().equals(ItemType.GOLD) && lootItem.getObjectUUID() != this.getGoldInventory().getObjectUUID() && !(this.absCharacter.getObjectType().equals(GameObjectType.Mob))) return null; - else if (!this.inventory.contains(lootItem) && !this.equipped.containsValue(lootItem) && !lootItem.template.item_type.equals(ItemType.GOLD)) + else if (!this.inventory.contains(lootItem) && !this.equipped.containsValue(lootItem) && !lootItem.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) return null; // get weight of item @@ -1197,10 +1197,10 @@ public class CharacterItemManager { int weight = lootItem.template.item_wt; // make sure lootingPlayer has room for item - if (!lootItem.template.item_type.equals(ItemType.GOLD) && !looterItems.hasRoomInventory(weight)) + if (!lootItem.template.cacheTemplate.getItemType().equals(ItemType.GOLD) && !looterItems.hasRoomInventory(weight)) return null; - if (lootItem.template.item_type.equals(ItemType.GOLD)) + if (lootItem.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) if (amount != -1) { //from steal int total = lootItem.getNumOfItems(); amount = (amount > total) ? total : amount; @@ -1263,19 +1263,19 @@ public class CharacterItemManager { * Delegates */ public synchronized boolean bankContains(Item item) { - if (item.template.item_type.equals(ItemType.GOLD)) + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) return (this.getGoldBank() != null && this.goldBank.getObjectUUID() == item.getObjectUUID()); return bank.contains(item); } public synchronized boolean inventoryContains(Item item) { - if (item.template.item_type.equals(ItemType.GOLD)) + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) return (this.getGoldInventory() != null && this.goldInventory.getObjectUUID() == item.getObjectUUID()); return inventory.contains(item); } public synchronized boolean vaultContains(Item item) { - if (item.template.item_type.equals(ItemType.GOLD)) + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) return (this.getGoldVault() != null && this.goldVault.getObjectUUID() == item.getObjectUUID()); return this.account.getVault().contains(item); } @@ -1518,13 +1518,13 @@ public class CharacterItemManager { item.zeroItem(); item.containerType = mbEnums.ItemContainerType.INVENTORY; - if (item.template.item_type.equals(ItemType.GOLD)) + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) //only add gold item once if (!corpse.hasGold()) corpse.setHasGold(true); newInventory.add(item); } else //item - if (item.template.item_type.equals(ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) { int amt = item.getNumOfItems(); item.setNumOfItems(0); MobLoot ml = new MobLoot(this.absCharacter, amt); diff --git a/src/engine/objects/Corpse.java b/src/engine/objects/Corpse.java index 163458ab..d3a76ff0 100644 --- a/src/engine/objects/Corpse.java +++ b/src/engine/objects/Corpse.java @@ -299,11 +299,11 @@ public class Corpse extends AbstractWorldObject { int weight = item.template.item_wt; //make sure looter has room for item - if (item.template.item_type.equals(ItemType.GOLD) == false && !looterItems.hasRoomInventory(weight)) + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD) == false && !looterItems.hasRoomInventory(weight)) return null; //attempt to transfer item in db - if (item.template.item_type.equals(ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) { if (!looterItems.moveGoldToInventory(item, item.getNumOfItems())) return null; } else if (!item.moveItemToInventory(looter)) diff --git a/src/engine/objects/Item.java b/src/engine/objects/Item.java index 876227d7..5d6e1afd 100644 --- a/src/engine/objects/Item.java +++ b/src/engine/objects/Item.java @@ -463,7 +463,7 @@ public class Item extends AbstractWorldObject { int serialized = 0; for (Item item : list) { - if (item.template.item_type.equals(ItemType.GOLD)) + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) if (item.numberOfItems == 0) continue; try { @@ -497,7 +497,7 @@ public class Item extends AbstractWorldObject { int serialized = 0; for (Item item : list) { - if (item.template.item_type.equals(ItemType.GOLD)) + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) if (item.numberOfItems == 0) continue; try { diff --git a/src/engine/objects/MobLoot.java b/src/engine/objects/MobLoot.java index d368c844..d5eeb39c 100644 --- a/src/engine/objects/MobLoot.java +++ b/src/engine/objects/MobLoot.java @@ -45,7 +45,7 @@ public final class MobLoot extends Item { this.ownerID = mob.getObjectUUID(); this.objectUUID = generateId(); - if (quantity == 0 && template.item_type == ItemType.RESOURCE) + if (quantity == 0 && template.cacheTemplate.getItemType() == ItemType.RESOURCE) quantity = 1; if (quantity > 0) @@ -105,7 +105,7 @@ public final class MobLoot extends Item { if (isDeleted) return null; - if (this.template.item_type.equals(ItemType.GOLD)) + if (this.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) return null; Item item = this; diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java index a75a5190..0f3a50a8 100644 --- a/src/engine/objects/NPC.java +++ b/src/engine/objects/NPC.java @@ -969,7 +969,7 @@ public class NPC extends AbstractCharacter { if (itemTemplate.item_skill_required.values().iterator().hasNext()) skillRequired = itemTemplate.item_skill_required.values().iterator().next(); - boolean exclude = skillRequired == 0 && ItemTemplate.templates.get(itemID).item_type.equals(ItemType.WEAPON); + boolean exclude = skillRequired == 0 && ItemTemplate.templates.get(itemID).cacheTemplate.getItemType().equals(ItemType.WEAPON); if (skillRequired <= maxSkill && !exclude) filteredItemList.add(itemID); } diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 18da2e2c..96b55b73 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -2819,11 +2819,11 @@ public class PlayerCharacter extends AbstractCharacter { ItemTemplate ib = item.template; if (ib != null) { - if ((item.template.item_type.equals(ItemType.WEAPON)) + if ((item.template.cacheTemplate.getItemType().equals(ItemType.WEAPON)) && (item.template.item_skill_used.equals(type) || ib.item_skill_mastery_used.equals(type))) return true; - return (item.template.item_type.equals(ItemType.ARMOR)) + return (item.template.cacheTemplate.getItemType().equals(ItemType.ARMOR)) && (item.template.item_skill_used.equals(type)); } diff --git a/src/engine/objects/Resists.java b/src/engine/objects/Resists.java index 86519808..a0de2e6f 100644 --- a/src/engine/objects/Resists.java +++ b/src/engine/objects/Resists.java @@ -162,7 +162,7 @@ public class Resists { if (armor == null) return phys; - if (armor.template.item_type.equals(mbEnums.ItemType.ARMOR)) { + if (armor.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.ARMOR)) { phys[0] += armor.template.combat_attack_resist.get("SLASHING"); phys[1] += armor.template.combat_attack_resist.get("CRUSHING"); phys[2] += armor.template.combat_attack_resist.get("PIERCING"); diff --git a/src/engine/objects/Warehouse.java b/src/engine/objects/Warehouse.java index bfcf5301..33e2b011 100644 --- a/src/engine/objects/Warehouse.java +++ b/src/engine/objects/Warehouse.java @@ -304,7 +304,7 @@ public class Warehouse { return false; } - if (resource.template.item_type.equals(mbEnums.ItemType.GOLD)) + if (resource.template.cacheTemplate.getItemType().equals(mbEnums.ItemType.GOLD)) resourceType = mbEnums.ResourceType.GOLD; else resourceType = mbEnums.ResourceType.valueOf(ItemTemplate.templates.get(resource.templateID).item_base_name.toUpperCase()); diff --git a/src/engine/powers/poweractions/StealPowerAction.java b/src/engine/powers/poweractions/StealPowerAction.java index 0d2a6885..655a2274 100644 --- a/src/engine/powers/poweractions/StealPowerAction.java +++ b/src/engine/powers/poweractions/StealPowerAction.java @@ -63,7 +63,7 @@ public class StealPowerAction extends AbstractPowerAction { //called to get amount of gold to steal between 0 and max gold protected static int getAmountToSteal(Item item) { - if (item.template.item_type.equals(ItemType.GOLD)) { + if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) { int amount = item.getNumOfItems(); @@ -159,7 +159,7 @@ public class StealPowerAction extends AbstractPowerAction { if (myCIM == null || ownerCIM == null) return; - if (tar.template.item_type.equals(ItemType.GOLD)) { + if (tar.template.cacheTemplate.getItemType().equals(ItemType.GOLD)) { //stealing gold if (!myCIM.transferGoldToMyInventory((AbstractCharacter) owner, amount)) return;