Tweak some event handling.

Fixes WORLDGUARD-4097, WORLDGUARD-3360.
EngineHub · Jun 6, 2019 · b152cdc · b152cdc
1 parent d019e43
commit b152cdc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 36 deletions.
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java
@@ -47,6 +47,7 @@
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockDispenseEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -121,6 +122,9 @@ public void onPlaceBlock(final PlaceBlockEvent event) {
 
     @EventHandler(ignoreCancelled = true)
     public void onUseBlock(final UseBlockEvent event) {
+        if (event.getResult() == Event.Result.ALLOW) {
+            return;
+        }
         Player player = event.getCause().getFirstPlayer();
 
         if (player == null) {

diff --git a/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
@@ -423,7 +423,8 @@ public void onPlayerInteract(PlayerInteractEvent event) {
                     placed = clicked.getRelative(event.getBlockFace());
 
                     // Only fire events for blocks that are modified when right clicked
-                    final boolean hasItemInteraction = item != null && isItemAppliedToBlock(item, clicked);
+                    final boolean hasItemInteraction = item != null && isItemAppliedToBlock(item, clicked)
+                            && event.getAction() == Action.RIGHT_CLICK_BLOCK;
                     modifiesWorld = isBlockModifiedOnClick(clicked, event.getAction() == Action.RIGHT_CLICK_BLOCK)
                             || hasItemInteraction;
 

diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java
@@ -20,13 +20,12 @@
 package com.sk89q.worldguard.bukkit.util;
 
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
-import org.bukkit.material.Bed;
-import org.bukkit.material.Chest;
-import org.bukkit.material.MaterialData;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Bed;
+import org.bukkit.block.data.type.Chest;
+import org.bukkit.util.Vector;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -47,37 +46,20 @@ private Blocks() {
      */
     public static List<Block> getConnected(Block block) {
         BlockState state = block.getState();
-        MaterialData data = state.getData();
+        BlockData data = state.getBlockData();
 
         if (data instanceof Bed) {
             Bed bed = (Bed) data;
-            if (bed.isHeadOfBed()) {
-                return Collections.singletonList(block.getRelative(bed.getFacing().getOppositeFace()));
-            } else {
-                return Collections.singletonList(block.getRelative(bed.getFacing()));
-            }
+            return Collections.singletonList(block.getRelative(bed.getPart() == Bed.Part.FOOT
+                    ? bed.getFacing() : bed.getFacing().getOppositeFace()));
         } else if (data instanceof Chest) {
-            BlockFace facing = ((Chest) data).getFacing();
-            ArrayList<Block> chests = new ArrayList<>();
-            if (facing == BlockFace.NORTH || facing == BlockFace.SOUTH) {
-                if (block.getRelative(BlockFace.EAST).getState().getData() instanceof Chest) {
-                    chests.add(block.getRelative(BlockFace.EAST));
-                }
-                if (block.getRelative(BlockFace.WEST).getState().getData() instanceof Chest) {
-                    chests.add(block.getRelative(BlockFace.WEST));
-                }
-            } else if (facing == BlockFace.EAST || facing == BlockFace.WEST) {
-                if (block.getRelative(BlockFace.NORTH).getState().getData() instanceof Chest) {
-                    chests.add(block.getRelative(BlockFace.NORTH));
-                }
-                if (block.getRelative(BlockFace.SOUTH).getState().getData() instanceof Chest) {
-                    chests.add(block.getRelative(BlockFace.SOUTH));
-                }
-            } else {
-                // don't know how to handle diagonal chests
+            final Chest chest = (Chest) data;
+            Chest.Type type = chest.getType();
+            if (type == Chest.Type.SINGLE) {
                 return Collections.emptyList();
             }
-            return chests;
+            Vector offset = chest.getFacing().getDirection().rotateAroundY(Math.PI / 2 * (type == Chest.Type.LEFT ? -1 : 1));
+            return Collections.singletonList(block.getRelative((int) Math.round(offset.getX()), 0, (int) Math.round(offset.getZ())));
         } else {
             return Collections.emptyList();
         }

diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
@@ -449,7 +449,7 @@ public final class Materials {
 
         MATERIAL_FLAGS.put(Material.IRON_SHOVEL, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.IRON_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.IRON_AXE, 0);
+        MATERIAL_FLAGS.put(Material.IRON_AXE, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.FLINT_AND_STEEL, 0);
         MATERIAL_FLAGS.put(Material.APPLE, 0);
         MATERIAL_FLAGS.put(Material.BOW, 0);
@@ -462,22 +462,22 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.WOODEN_SWORD, 0);
         MATERIAL_FLAGS.put(Material.WOODEN_SHOVEL, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.WOODEN_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.WOODEN_AXE, 0);
+        MATERIAL_FLAGS.put(Material.WOODEN_AXE, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.STONE_SWORD, 0);
         MATERIAL_FLAGS.put(Material.STONE_SHOVEL, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.STONE_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.STONE_AXE, 0);
+        MATERIAL_FLAGS.put(Material.STONE_AXE, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.DIAMOND_SWORD, 0);
         MATERIAL_FLAGS.put(Material.DIAMOND_SHOVEL, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.DIAMOND_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.DIAMOND_AXE, 0);
+        MATERIAL_FLAGS.put(Material.DIAMOND_AXE, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.STICK, 0);
         MATERIAL_FLAGS.put(Material.BOWL, 0);
         MATERIAL_FLAGS.put(Material.MUSHROOM_STEW, 0);
         MATERIAL_FLAGS.put(Material.GOLDEN_SWORD, 0);
         MATERIAL_FLAGS.put(Material.GOLDEN_SHOVEL, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.GOLDEN_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.GOLDEN_AXE, 0);
+        MATERIAL_FLAGS.put(Material.GOLDEN_AXE, MODIFIES_BLOCKS);
         MATERIAL_FLAGS.put(Material.STRING, 0);
         MATERIAL_FLAGS.put(Material.FEATHER, 0);
         MATERIAL_FLAGS.put(Material.GUNPOWDER, 0);