From a61df070e66e803fe7eb74ea4c21d5a08cf30667 Mon Sep 17 00:00:00 2001 From: Intelli Date: Sat, 16 Oct 2021 16:05:39 -0600 Subject: [PATCH] Fixed InventoryMoveItemEvent still processing if both hopper & item transactions are disabled --- .../listener/player/InventoryChangeListener.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java b/src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java index ed87fb5..c8f2e41 100644 --- a/src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java +++ b/src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java @@ -316,6 +316,11 @@ public final class InventoryChangeListener extends Queue implements Listener { return; } + boolean hopperTransactions = Config.getConfig(location.getWorld()).HOPPER_TRANSACTIONS; + if (!hopperTransactions && !Config.getConfig(location.getWorld()).ITEM_TRANSACTIONS) { + return; + } + InventoryHolder sourceHolder = PaperAdapter.ADAPTER.getHolder(event.getSource(), false); if (sourceHolder == null) { return; @@ -326,7 +331,7 @@ public final class InventoryChangeListener extends Queue implements Listener { return; } - if (Config.getConfig(location.getWorld()).HOPPER_TRANSACTIONS) { + if (hopperTransactions) { if (Validate.isHopper(destinationHolder) && (Validate.isContainer(sourceHolder) && !Validate.isHopper(sourceHolder))) { HopperPullListener.processHopperPull(location, sourceHolder, destinationHolder, event.getItem()); }