From 28025434fba4a7b3523962104e24061412c2df6d Mon Sep 17 00:00:00 2001 From: Esophose Date: Sat, 1 Jun 2019 09:53:10 -0600 Subject: [PATCH] Duality transfer issue fix, blockbreak container ignore fix --- .../epichoppers/hopper/levels/modules/ModuleBlockBreak.java | 2 +- src/main/java/com/songoda/epichoppers/tasks/HopTask.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java b/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java index a64c94a..e267199 100644 --- a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java +++ b/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java @@ -55,7 +55,7 @@ public class ModuleBlockBreak implements Module { if (above.getType() == Material.WATER || above.getType() == Material.LAVA || above.getType() == Material.AIR - || above instanceof InventoryHolder) + || above.getState() instanceof InventoryHolder) return; // Don't break farm items from EpicFarming diff --git a/src/main/java/com/songoda/epichoppers/tasks/HopTask.java b/src/main/java/com/songoda/epichoppers/tasks/HopTask.java index 8357ed6..a16dfbb 100644 --- a/src/main/java/com/songoda/epichoppers/tasks/HopTask.java +++ b/src/main/java/com/songoda/epichoppers/tasks/HopTask.java @@ -375,7 +375,7 @@ public class HopTask extends BukkitRunnable { // Prevent item from being moved again during this cycle. // Only block if the hopper being transfered into doesn't already contain the same item. // Don't blacklist if the block is transfering items into itself - if (!destinationInventory.contains(itemToMove) && currentDestination != currentHolder) + if (!destinationInventory.contains(itemToMove) && currentDestination != currentHolder && currentHolder instanceof Hopper) this.blacklist.put(currentDestination, itemToMove); // Move item to destination.