Fixed dropper transactions not being logged when using Paper

PlayPro · Aug 8, 2023 · 1b6d2ec · 1b6d2ec
1 parent d791026
commit 1b6d2ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/net/coreprotect/listener/block/BlockDispenseListener.java b/src/main/java/net/coreprotect/listener/block/BlockDispenseListener.java
@@ -49,7 +49,7 @@ protected void onBlockDispense(BlockDispenseEvent event) {
                 boolean dispenseSuccess = !event.getVelocity().equals(new Vector()); // true if velocity is set
                 boolean dispenseRelative = newBlock.getLocation().equals(velocityLocation); // true if velocity location matches relative location
 
-                if (!BlockPreDispenseListener.useBlockPreDispenseEvent) {
+                if (!BlockPreDispenseListener.useBlockPreDispenseEvent || (!BlockPreDispenseListener.useForDroppers && block.getType() == Material.DROPPER)) {
                     if (dispenseRelative || material.equals(Material.FLINT_AND_STEEL) || material.equals(Material.SHEARS)) {
                         forceItem = false;
                     }

diff --git a/src/main/java/net/coreprotect/paper/listener/BlockPreDispenseListener.java b/src/main/java/net/coreprotect/paper/listener/BlockPreDispenseListener.java
@@ -1,5 +1,6 @@
 package net.coreprotect.paper.listener;
 
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
@@ -18,6 +19,7 @@
 public final class BlockPreDispenseListener extends Queue implements Listener {
 
     public static boolean useBlockPreDispenseEvent = true;
+    public static boolean useForDroppers = false;
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockPreDispense(BlockPreDispenseEvent event) {
@@ -29,6 +31,10 @@ public void onBlockPreDispense(BlockPreDispenseEvent event) {
 
         BlockData blockData = block.getBlockData();
         if (blockData instanceof Dispenser) {
+            if (!useForDroppers && block.getType() == Material.DROPPER) {
+                useForDroppers = true;
+            }
+
             String user = "#dispenser";
             ItemStack[] inventory = ((InventoryHolder) block.getState()).getInventory().getStorageContents();
             InventoryChangeListener.inventoryTransaction(user, block.getLocation(), inventory);