Dont Override Interaction while Sneaking

This commit is contained in:
Sn0wStorm
2013-09-04 23:46:07 +02:00
parent bfe859d3bc
commit a990e91496
@@ -31,11 +31,12 @@ public class PlayerListener implements Listener {
if (clickedBlock != null) { if (clickedBlock != null) {
if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
Player player = event.getPlayer();
if (!player.isSneaking()) {
if (clickedBlock.getType() == Material.CAULDRON) { if (clickedBlock.getType() == Material.CAULDRON) {
if (clickedBlock.getRelative(BlockFace.DOWN).getType() == Material.FIRE || clickedBlock.getRelative(BlockFace.DOWN).getType() == Material.STATIONARY_LAVA if (clickedBlock.getRelative(BlockFace.DOWN).getType() == Material.FIRE || clickedBlock.getRelative(BlockFace.DOWN).getType() == Material.STATIONARY_LAVA
|| clickedBlock.getRelative(BlockFace.DOWN).getType() == Material.LAVA) { || clickedBlock.getRelative(BlockFace.DOWN).getType() == Material.LAVA) {
Material materialInHand = event.getMaterial(); Material materialInHand = event.getMaterial();
Player player = event.getPlayer();
ItemStack item = event.getItem(); ItemStack item = event.getItem();
@@ -88,7 +89,7 @@ public class PlayerListener implements Listener {
Block broken = Barrel.getBrokenBlock(clickedBlock); Block broken = Barrel.getBrokenBlock(clickedBlock);
// barrel is built correctly // barrel is built correctly
if (broken == null) { if (broken == null) {
barrel.open(event.getPlayer()); barrel.open(player);
} else { } else {
barrel.remove(broken); barrel.remove(broken);
} }
@@ -96,6 +97,7 @@ public class PlayerListener implements Listener {
} }
} }
} }
}
if (event.getAction() == Action.LEFT_CLICK_AIR) { if (event.getAction() == Action.LEFT_CLICK_AIR) {
if (!event.hasItem()) { if (!event.hasItem()) {