zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Fixed InventoryMoveItemEvent still processing if both hopper & item transactions are disabled

Browse source
This commit is contained in:
Intelli 2021-10-16 16:05:39 -06:00
parent 3742e018c4
commit a61df070e6
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java
View file

@ -316,6 +316,11 @@ public final class InventoryChangeListener extends Queue implements Listener {
return; 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); InventoryHolder sourceHolder = PaperAdapter.ADAPTER.getHolder(event.getSource(), false);
if (sourceHolder == null) { if (sourceHolder == null) {
return; return;
@ -326,7 +331,7 @@ public final class InventoryChangeListener extends Queue implements Listener {
return; return;
} }
if (Config.getConfig(location.getWorld()).HOPPER_TRANSACTIONS) { if (hopperTransactions) {
if (Validate.isHopper(destinationHolder) && (Validate.isContainer(sourceHolder) && !Validate.isHopper(sourceHolder))) { if (Validate.isHopper(destinationHolder) && (Validate.isContainer(sourceHolder) && !Validate.isHopper(sourceHolder))) {
HopperPullListener.processHopperPull(location, sourceHolder, destinationHolder, event.getItem()); HopperPullListener.processHopperPull(location, sourceHolder, destinationHolder, event.getItem());
} }