diff --git a/src/engine/objects/Item.java b/src/engine/objects/Item.java index b23c6a33..17a05a6a 100644 --- a/src/engine/objects/Item.java +++ b/src/engine/objects/Item.java @@ -637,10 +637,6 @@ public class Item extends AbstractWorldObject { return 0; } - public ItemBase getItemBase() { - return ItemBase.getItemBase(templateID); - } - public int getTemplateID() { return this.templateID; } diff --git a/src/engine/objects/ItemBase.java b/src/engine/objects/ItemBase.java index a2f9fff0..3bd2485c 100644 --- a/src/engine/objects/ItemBase.java +++ b/src/engine/objects/ItemBase.java @@ -22,17 +22,10 @@ public class ItemBase { public static HashMap _itemBaseByUUID = new HashMap<>(); public final int uuid; - private final int modTable; public ItemBase(ResultSet rs) throws SQLException { this.uuid = rs.getInt("ID"); - this.modTable = rs.getInt("modTable"); - - ItemTemplate template = ItemTemplate.templates.get(this.getUUID()); - - if (template == null) - Logger.error(this.getUUID() + " null template"); } @@ -46,11 +39,6 @@ public class ItemBase { Logger.error("Null template for: " + itemBase.uuid); } - public static ItemBase getItemBase(int uuid) { - - return _itemBaseByUUID.get(uuid); - } - public static HashMap getUUIDCache() { return _itemBaseByUUID; } @@ -60,10 +48,6 @@ public class ItemBase { } - public int getModTable() { - return modTable; - } - public final int getUUID() { return uuid; } diff --git a/src/engine/objects/ItemTemplate.java b/src/engine/objects/ItemTemplate.java index 4c5e9de3..1cac25eb 100644 --- a/src/engine/objects/ItemTemplate.java +++ b/src/engine/objects/ItemTemplate.java @@ -579,7 +579,7 @@ public class ItemTemplate { //players can't wear 0 value items. - return item.template.item_value != 0 || Kit.IsNoobGear(item.getItemBase().uuid); + return item.template.item_value != 0 || Kit.IsNoobGear(item.templateID); } }