From e841afb5c692a8bf9afcf6fd91db5d5b27cc27cc Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Sun, 7 Sep 2014 20:18:47 -0700 Subject: [PATCH] Prevent theft from hopper minecarts. Hopper minecarts in claims now require container trust to access their inventories. --- .../ryanhamshire/GriefPrevention/PlayerEventHandler.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 6b57203..40a3af1 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -37,10 +37,11 @@ import org.bukkit.entity.Animals; import org.bukkit.entity.Boat; import org.bukkit.entity.Entity; import org.bukkit.entity.Hanging; -import org.bukkit.entity.PoweredMinecart; -import org.bukkit.entity.StorageMinecart; import org.bukkit.entity.Player; import org.bukkit.entity.Vehicle; +import org.bukkit.entity.minecart.HopperMinecart; +import org.bukkit.entity.minecart.PoweredMinecart; +import org.bukkit.entity.minecart.StorageMinecart; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -760,8 +761,8 @@ class PlayerEventHandler implements Listener Claim claim = this.dataStore.getClaimAt(entity.getLocation(), false, null); if(claim != null) { - //for storage and powered minecarts, apply container rules (this is a potential theft) - if(entity instanceof StorageMinecart || entity instanceof PoweredMinecart) + //for storage entities, apply container rules (this is a potential theft) + if(entity instanceof InventoryHolder) { String noContainersReason = claim.allowContainers(player); if(noContainersReason != null)