summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-03-26 15:14:40 +0000
committerKHobbits <rob@khobbits.co.uk>2014-03-26 15:14:40 +0000
commit0b11abf8f44712f6ce6e7dfdae68521a67794a6b (patch)
treed0c178abefac50ecb0992608acf907dc29de1c2c
parentb673882b2f1583d8e885789b2cc6ed82f7bd4c06 (diff)
downloadEssentials-0b11abf8f44712f6ce6e7dfdae68521a67794a6b.tar
Essentials-0b11abf8f44712f6ce6e7dfdae68521a67794a6b.tar.gz
Essentials-0b11abf8f44712f6ce6e7dfdae68521a67794a6b.tar.lz
Essentials-0b11abf8f44712f6ce6e7dfdae68521a67794a6b.tar.xz
Essentials-0b11abf8f44712f6ce6e7dfdae68521a67794a6b.zip
Revert "Do not allow a block with an Essentials Sign attached to it to be pulled with a sticky piston"
This reverts commit b673882b2f1583d8e885789b2cc6ed82f7bd4c06.
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java27
1 files changed, 2 insertions, 25 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
index 55b05a0e1..225965c2b 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
@@ -1,17 +1,16 @@
package com.earth2me.essentials;
-import com.earth2me.essentials.signs.EssentialsSign;
import com.earth2me.essentials.utils.LocationUtil;
import java.util.Locale;
import net.ess3.api.IEssentials;
import org.bukkit.GameMode;
import org.bukkit.Material;
-import org.bukkit.block.*;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.CreatureSpawner;
import org.bukkit.entity.EntityType;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockPistonRetractEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.inventory.ItemStack;
@@ -69,26 +68,4 @@ public class EssentialsBlockListener implements Listener
});
}
}
-
- @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
- public void onBlockPistonRetract(BlockPistonRetractEvent event)
- {
- final Block block = event.getRetractLocation().getBlock();
- for (BlockFace face : new BlockFace[] { BlockFace.NORTH, BlockFace.EAST, BlockFace.WEST, BlockFace.SOUTH, BlockFace.UP })
- {
- final Block search = block.getRelative(face, 1);
- final Material type = search.getType();
- if (type == Material.SIGN || type == Material.SIGN_POST)
- {
- final Sign sign = (Sign)(search.getState());
- for (final EssentialsSign esign : ess.getSettings().enabledSigns())
- {
- if (sign.getLine(0).equalsIgnoreCase(esign.getSuccessName()))
- {
- event.setCancelled(true);
- }
- }
- }
- }
- }
}