diff --git a/MobArena.jar b/MobArena.jar index ed15de8..0ca6763 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/src/com/garbagemule/MobArena/MABlockListener.java b/src/com/garbagemule/MobArena/MABlockListener.java index 93fdd0a..cbc057b 100644 --- a/src/com/garbagemule/MobArena/MABlockListener.java +++ b/src/com/garbagemule/MobArena/MABlockListener.java @@ -4,7 +4,6 @@ import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockIgniteEvent; import org.bukkit.event.block.BlockListener; import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.block.BlockPlaceEvent; public class MABlockListener extends BlockListener @@ -40,9 +39,11 @@ public class MABlockListener extends BlockListener arena.eventListener.onBlockIgnite(event); } + /* public void onBlockPhysics(BlockPhysicsEvent event) { for (Arena arena : am.arenas) arena.eventListener.onBlockPhysics(event); } + */ } \ No newline at end of file diff --git a/src/com/garbagemule/MobArena/MAListener.java b/src/com/garbagemule/MobArena/MAListener.java index 1f5d105..e24df20 100644 --- a/src/com/garbagemule/MobArena/MAListener.java +++ b/src/com/garbagemule/MobArena/MAListener.java @@ -19,7 +19,6 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockEvent; import org.bukkit.event.block.BlockIgniteEvent; -import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityCombustEvent; @@ -44,7 +43,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.material.Attachable; import org.bukkit.material.Bed; import org.bukkit.material.Door; -import org.bukkit.material.MaterialData; import org.bukkit.material.Redstone; import com.garbagemule.MobArena.MAMessages.Msg; @@ -61,6 +59,7 @@ public class MAListener implements ArenaListener this.plugin = plugin; } + /* public void onBlockPhysics(BlockPhysicsEvent event) { if (!arena.inRegion(event.getBlock().getLocation()) || arena.softRestore) @@ -70,6 +69,7 @@ public class MAListener implements ArenaListener if (data instanceof Attachable || data instanceof Bed || data instanceof Door || data instanceof Redstone) event.setCancelled(true); } + */ public void onBlockBreak(BlockBreakEvent event) { @@ -270,7 +270,7 @@ public class MAListener implements ArenaListener if (damager instanceof Player) arena.playerKill((Player) damager); - event.getDrops().clear(); + event.getDrops().clear(); arena.resetIdleTimer(); return; } @@ -355,7 +355,7 @@ public class MAListener implements ArenaListener // Subtract boss health, and reset actual entity health arena.bossWave.subtractHealth(event.getDamage()); - arena.bossWave.getEntity().setHealth(200); + arena.bossWave.getEntity().setHealth(100); // Set damage to 1 for knockback and feedback event.setDamage(1); diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java index 762ca41..1c0022c 100644 --- a/src/com/garbagemule/MobArena/MobArena.java +++ b/src/com/garbagemule/MobArena/MobArena.java @@ -121,7 +121,6 @@ public class MobArena extends JavaPlugin// implements ArenaPlugin pm.registerEvent(Event.Type.BLOCK_BREAK, blockListener, Priority.Highest, this); pm.registerEvent(Event.Type.BLOCK_BURN, blockListener, Priority.Highest, this); pm.registerEvent(Event.Type.BLOCK_PLACE, blockListener, Priority.Highest, this); - pm.registerEvent(Event.Type.BLOCK_PHYSICS, blockListener, Priority.Normal, this); pm.registerEvent(Event.Type.BLOCK_IGNITE, blockListener, Priority.Highest, this); pm.registerEvent(Event.Type.PLAYER_INTERACT, playerListener, Priority.Normal, this); pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, playerListener, Priority.Normal, this); @@ -153,7 +152,7 @@ public class MobArena extends JavaPlugin// implements ArenaPlugin return p.hasPermission(s); // Otherwise, only allow commands that aren't admin/setup commands. - return !s.matches("^.*\\.setup\\..*$") && !s.matches("^.*\\.admin\\..*$"); + return !s.matches("^mobarena\\.setup\\..*$") && !s.matches("^mobarena\\.admin\\..*$"); } // Console printing