From ce7b9ff96f7892b90d50ad2f734d17273385b00d Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Wed, 27 Mar 2024 17:49:35 -0500 Subject: [PATCH] remove ItemBase from NPC --- src/engine/objects/NPC.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java index b8c9e195..01e90bd1 100644 --- a/src/engine/objects/NPC.java +++ b/src/engine/objects/NPC.java @@ -1064,11 +1064,11 @@ public class NPC extends AbstractCharacter { maxSkill = 110; break; } - ItemTemplate itemBase; + ItemTemplate itemTemplate; for (Integer itemID : fullItemList) { - itemBase = ItemTemplate.templates.get(itemID); - boolean exclude = (int)itemBase.item_skill_required.values().toArray()[0] == 0 && ItemTemplate.templates.get(itemID).item_type == ItemType.WEAPON; - if ((int)itemBase.item_skill_required.values().toArray()[0] <= maxSkill && !exclude) + itemTemplate = ItemTemplate.templates.get(itemID); + boolean exclude = (int)itemTemplate.item_skill_required.values().toArray()[0] == 0 && ItemTemplate.templates.get(itemID).item_type == ItemType.WEAPON; + if ((int)itemTemplate.item_skill_required.values().toArray()[0] <= maxSkill && !exclude) filteredItemList.add(itemID); } if (this.contract.getVendorID() == 102) { @@ -1087,7 +1087,7 @@ public class NPC extends AbstractCharacter { public int getRollingTimeInSeconds(int itemID) { - ItemBase ib = ItemBase.getItemBase(itemID); + ItemTemplate ib = ItemTemplate.templates.get(itemID); if (ib == null) return 0;