Use Inventory#getHolder(boolean useSnapshot) where available.

Dedicated to @Phoenix616
EngineHub · Jun 21, 2020 · c1ec708 · c1ec708
1 parent f4a3e8a
commit c1ec708
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/worldguard-bukkit/build.gradle.kts b/worldguard-bukkit/build.gradle.kts
@@ -24,7 +24,7 @@ repositories {
 dependencies {
     "compile"(project(":worldguard-core"))
     //"compile"(project(":worldguard-libs:bukkit"))
-    "api"("com.destroystokyo.paper:paper-api:1.15-R0.1-SNAPSHOT")
+    "api"("com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT")
     "implementation"("io.papermc:paperlib:1.0.2")
     "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }
     "implementation"("com.sk89q:commandbook:2.3") { isTransitive = false }

diff --git a/...d-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/...d-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
@@ -139,6 +139,7 @@
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.projectiles.ProjectileSource;
@@ -158,6 +159,17 @@ public class EventAbstractionListener extends AbstractListener {
     private final EventDebounce<BlockPistonRetractKey> pistonRetractDebounce = EventDebounce.create(5000);
     private final EventDebounce<BlockPistonExtendKey> pistonExtendDebounce = EventDebounce.create(5000);
 
+    private static final boolean HAS_SNAPSHOT_INVHOLDER;
+    static {
+        boolean temp;
+        try {
+            Inventory.class.getMethod("getHolder", boolean.class);
+            temp = true;
+        } catch (NoSuchMethodException e) {
+            temp = false;
+        }
+        HAS_SNAPSHOT_INVHOLDER = temp;
+    }
     /**
      * Construct the listener.
      *
@@ -919,7 +931,12 @@ public void onInventoryOpen(InventoryOpenEvent event) {
 
     @EventHandler(ignoreCancelled = true)
     public void onInventoryMoveItem(InventoryMoveItemEvent event) {
-        final InventoryHolder causeHolder = event.getInitiator().getHolder();
+        InventoryHolder causeHolder;
+        if (HAS_SNAPSHOT_INVHOLDER) {
+            causeHolder = event.getInitiator().getHolder(false);
+        } else {
+            causeHolder = event.getInitiator().getHolder();
+        }
 
         if (causeHolder instanceof Hopper
                 && getWorldConfig(BukkitAdapter.adapt((((Hopper) causeHolder).getWorld()))).ignoreHopperMoveEvents) {