Skip to content

Commit 70d225e

Browse files
committed
Split chest boat ride/open.
1 parent aa46529 commit 70d225e

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import org.bukkit.event.Event;
6262
import org.bukkit.event.Event.Result;
6363
import org.bukkit.event.EventHandler;
64+
import org.bukkit.event.inventory.InventoryOpenEvent;
6465
import org.bukkit.event.player.PlayerTakeLecternBookEvent;
6566
import org.bukkit.event.vehicle.VehicleExitEvent;
6667

@@ -410,13 +411,15 @@ public void onUseEntity(UseEntityEvent event) {
410411
canUse = event.getRelevantFlags().isEmpty() || query.queryState(BukkitAdapter.adapt(target), associable, combine(event)) != State.DENY;
411412
what = "use that";
412413
/* Paintings, item frames, etc. */
413-
} else if (Entities.isConsideredBuildingIfUsed(entity)) {
414+
} else if (Entities.isConsideredBuildingIfUsed(entity)
415+
// weird case since sneak+interact is chest access and not ride
416+
|| type == EntityType.CHEST_BOAT && event.getOriginalEvent() instanceof InventoryOpenEvent) {
414417
if ((type == EntityType.ITEM_FRAME || type == EntityType.GLOW_ITEM_FRAME)
415418
&& event.getCause().getFirstPlayer() != null
416419
&& ((ItemFrame) entity).getItem().getType() != Material.AIR) {
417420
canUse = query.testBuild(BukkitAdapter.adapt(target), associable, combine(event, Flags.ITEM_FRAME_ROTATE));
418421
what = "change that";
419-
} else if (Entities.isMinecart(type)) {
422+
} else if (Entities.isMinecart(type) || type == EntityType.CHEST_BOAT) {
420423
canUse = query.testBuild(BukkitAdapter.adapt(target), associable, combine(event, Flags.CHEST_ACCESS));
421424
what = "open that";
422425
} else {

0 commit comments

Comments
 (0)