mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-11-08 12:00:19 +01:00
Revert "Do not allow a block with an Essentials Sign attached to it to be pulled with a sticky piston"
This reverts commit b673882b2f
.
This commit is contained in:
parent
b673882b2f
commit
0b11abf8f4
@ -1,17 +1,16 @@
|
|||||||
package com.earth2me.essentials;
|
package com.earth2me.essentials;
|
||||||
|
|
||||||
import com.earth2me.essentials.signs.EssentialsSign;
|
|
||||||
import com.earth2me.essentials.utils.LocationUtil;
|
import com.earth2me.essentials.utils.LocationUtil;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import net.ess3.api.IEssentials;
|
import net.ess3.api.IEssentials;
|
||||||
import org.bukkit.GameMode;
|
import org.bukkit.GameMode;
|
||||||
import org.bukkit.Material;
|
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.entity.EntityType;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.block.BlockPistonRetractEvent;
|
|
||||||
import org.bukkit.event.block.BlockPlaceEvent;
|
import org.bukkit.event.block.BlockPlaceEvent;
|
||||||
import org.bukkit.inventory.ItemStack;
|
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user