From 77ffb6a3d530593a1b7932d4e97fd1b8dfd82cbd Mon Sep 17 00:00:00 2001 From: md678685 Date: Sat, 15 Dec 2018 18:53:06 +0000 Subject: [PATCH] Slightly simplify FlatItemDb --- .../src/com/earth2me/essentials/items/FlatItemDb.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/items/FlatItemDb.java b/Essentials/src/com/earth2me/essentials/items/FlatItemDb.java index 6c4147f67..25134492e 100644 --- a/Essentials/src/com/earth2me/essentials/items/FlatItemDb.java +++ b/Essentials/src/com/earth2me/essentials/items/FlatItemDb.java @@ -162,7 +162,7 @@ public class FlatItemDb extends AbstractItemDb { Material type = item.getType(); PotionData potion = null; - if ((type.name().contains("POTION") || type.name().equals("TIPPED_ARROW")) && item.getItemMeta() instanceof PotionMeta) { + if (MaterialUtil.isPotion(type) && item.getItemMeta() instanceof PotionMeta) { potion = ((PotionMeta) item.getItemMeta()).getBasePotionData(); } @@ -195,7 +195,6 @@ public class FlatItemDb extends AbstractItemDb { } public static class ItemData { - private String itemName; private Material material; private PotionData potionData; @@ -221,10 +220,6 @@ public class FlatItemDb extends AbstractItemDb { return this.material == that.getMaterial() && potionDataEquals(that); } - public String getItemName() { - return itemName; - } - public Material getMaterial() { return material; }