EpicKnarvik97/BlockHunt
EpicKnarvik97/BlockHunt
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

* Fixed players being able to break fire. Fixes #72.

Browse Source
This commit is contained in:
RandomPanda30 2013-10-26 16:38:26 +01:00
parent a8516aa665
commit 2a1f8fc123
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nl/Steffion/BlockHunt/Listeners/OnBlockBreakEvent.java
View File

@ -30,8 +30,5 @@ public class OnBlockBreakEvent implements Listener {
event.setCancelled(true); event.setCancelled(true);
} }
} }
if (event.getBlock().equals(Material.FIRE)) {
event.setCancelled(true);
}
} }
} }

17
src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java
View File

@ -34,6 +34,7 @@ public class OnPlayerInteractEvent implements Listener {
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
public void onPlayerInteractEvent(PlayerInteractEvent event) { public void onPlayerInteractEvent(PlayerInteractEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
Block block = event.getClickedBlock();
if (PermissionsM.hasPerm(player, Permissions.create, false)) { if (PermissionsM.hasPerm(player, Permissions.create, false)) {
ItemStack item = player.getItemInHand(); ItemStack item = player.getItemInHand();
if (item.getType() != Material.AIR) { if (item.getType() != Material.AIR) {
@ -141,19 +142,24 @@ public class OnPlayerInteractEvent implements Listener {
} }
} }
if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (event.getAction() == Action.RIGHT_CLICK_BLOCK
|| event.getAction() == Action.LEFT_CLICK_BLOCK) {
if (event.getClickedBlock().getType() != Material.AIR) {
if (event.getClickedBlock().getType() if (event.getClickedBlock().getType()
.equals(Material.ENCHANTMENT_TABLE) .equals(Material.ENCHANTMENT_TABLE)
|| event.getClickedBlock().getType() || event.getClickedBlock().getType()
.equals(Material.WORKBENCH) .equals(Material.WORKBENCH)
|| event.getClickedBlock().getType() || event.getClickedBlock().getType()
.equals(Material.FURNACE) .equals(Material.FURNACE)
|| event.getClickedBlock().getType().equals(Material.CHEST) || event.getClickedBlock().getType()
|| event.getClickedBlock().getType().equals(Material.ANVIL) .equals(Material.CHEST)
|| event.getClickedBlock().getType()
.equals(Material.ANVIL)
|| event.getClickedBlock().getType() || event.getClickedBlock().getType()
.equals(Material.ENDER_CHEST) .equals(Material.ENDER_CHEST)
|| event.getClickedBlock().getType() || event.getClickedBlock().getType()
.equals(Material.JUKEBOX)) { .equals(Material.JUKEBOX)
|| block.getFace(block).equals(Material.FIRE)) {
for (Arena arena : W.arenaList) { for (Arena arena : W.arenaList) {
if (arena.playersInArena.contains(player)) { if (arena.playersInArena.contains(player)) {
event.setCancelled(true); event.setCancelled(true);
@ -161,6 +167,8 @@ public class OnPlayerInteractEvent implements Listener {
} }
} }
} }
}
if (event.getAction() == Action.LEFT_CLICK_BLOCK if (event.getAction() == Action.LEFT_CLICK_BLOCK
|| event.getAction() == Action.LEFT_CLICK_BLOCK) { || event.getAction() == Action.LEFT_CLICK_BLOCK) {
for (Arena arena : W.arenaList) { for (Arena arena : W.arenaList) {
@ -246,5 +254,6 @@ public class OnPlayerInteractEvent implements Listener {
} }
} }
} }
} }
} }