From 2c1d1ef0a3263efeb561cef4982fbb49cb38c164 Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 28 Jul 2014 14:45:05 -0700 Subject: [PATCH] Remove attachment check because it doesn't really make sense. --- .../worldguard/bukkit/WorldConfiguration.java | 3 --- .../bukkit/WorldGuardBlockListener.java | 15 --------------- 2 files changed, 18 deletions(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java index 1cd7824b..895f2e34 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java @@ -76,7 +76,6 @@ public class WorldConfiguration { /* Configuration data start */ public boolean summaryOnStart; public boolean opPermissions; - public boolean checkAttached; public boolean fireSpreadDisableToggle; public boolean itemDurability; public boolean simulateSponge; @@ -308,8 +307,6 @@ private void loadConfiguration() { summaryOnStart = getBoolean("summary-on-start", true); opPermissions = getBoolean("op-permissions", true); - checkAttached = getBoolean("internal.check-attached-blocks", false); - itemDurability = getBoolean("protection.item-durability", true); removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false); disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false); diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java index f908c474..3b482d3f 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java @@ -24,7 +24,6 @@ import com.sk89q.worldedit.blocks.BlockType; import com.sk89q.worldedit.blocks.ItemType; import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.internal.Blocks; import com.sk89q.worldguard.internal.Events; import com.sk89q.worldguard.internal.cause.Causes; import com.sk89q.worldguard.internal.event.BlockInteractEvent; @@ -142,13 +141,6 @@ public void onBlockBreak(BlockBreakEvent event) { } Events.fireToCancel(event, new BlockInteractEvent(event, Causes.create(event.getPlayer()), Interaction.BREAK, target)); - - if (wcfg.checkAttached) { - Block attachedTo = Blocks.getAttachesTo(target); - if (attachedTo != null) { - Events.fireToCancel(event, new BlockInteractEvent(event, Causes.create(event.getPlayer()), Interaction.BREAK, attachedTo)); - } - } } /* @@ -477,13 +469,6 @@ public void onBlockPlace(BlockPlaceEvent event) { Events.fireToCancel(event, new BlockInteractEvent(event, Causes.create(event.getPlayer()), Interaction.PLACE, target)); - if (wcfg.checkAttached) { - Block attachedTo = Blocks.getAttachesTo(event.getBlockPlaced()); - if (attachedTo != null) { - Events.fireToCancel(event, new BlockInteractEvent(event, Causes.create(event.getPlayer()), Interaction.BREAK, attachedTo)); - } - } - if (wcfg.simulateSponge && target.getType() == Material.SPONGE) { if (wcfg.redstoneSponges && target.isBlockIndirectlyPowered()) { return;