From b8f6eacca4d7f2e845469316b24d4e0b2856c85b Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sun, 22 Jan 2023 23:41:10 +0100 Subject: [PATCH] Revert "Buckets in inventories" This reverts commit cdf12be6561c9adc6475155c7ed059dbe7118c4d. --- .../steamwar/schematicsystem/autocheck/AutoChecker15.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java index fba059a..9f61fe9 100644 --- a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java +++ b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java @@ -138,12 +138,11 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker { if(itemType == null) //Leere Slots continue; - if(material == Material.DISPENSER && (itemType.equals(Material.FIRE_CHARGE) || itemType.equals(Material.ARROW))) { + if(material == Material.DISPENSER && (itemType.equals(Material.FIRE_CHARGE) || itemType.equals(Material.ARROW) || itemType.equals(Material.BUCKET))) { counter += item.getByte("Count"); - }else if (!FLOWERS.contains(itemType) && !((material == Material.CHEST || material == Material.BARREL) && itemType.equals(Material.TNT)) - && (material == Material.DISPENSER && !itemType.equals(Material.BUCKET))) { + } else if(!FLOWERS.contains(itemType) && !((material == Material.CHEST || material == Material.BARREL) && itemType.equals(Material.TNT))) { result.getForbiddenItems().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType); - } else if (item.containsKey("tag")) { + }else if(item.containsKey("tag")) { result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType); } }