From a830c72d223d440e970d3f32e5a392ecce72fa85 Mon Sep 17 00:00:00 2001 From: Chiss Date: Sat, 20 Sep 2014 15:29:59 +1000 Subject: [PATCH] Jukebox will be removed. --- .../src/mineplex/core/gadget/gadgets/SongData.java | 6 ++---- .../game/arcade/game/games/minestrike/MineStrike.java | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/SongData.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/SongData.java index 750e8454f..de334ad2a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/SongData.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/SongData.java @@ -23,11 +23,9 @@ public class SongData { if (System.currentTimeMillis() > EndTime) { - //Dont end until Jukebox cleaned - if (Block.getType() != Material.JUKEBOX && Block.getType() != Material.AIR) - return false; + if (Block.getType() == Material.JUKEBOX) + Block.setType(Material.AIR); - Block.setType(Material.AIR); return true; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index e7e159755..437395bb8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -1393,7 +1393,7 @@ public class MineStrike extends TeamGame if (_bombPlanter == null) return; - if (!_bombPlanter.isBlocking()) + if (!_bombPlanter.isBlocking() || !_bombPlanter.isOnline()) { _bombPlanter.setExp(0f); UtilTitle.clear(_bombPlanter); @@ -1502,7 +1502,7 @@ public class MineStrike extends TeamGame Block block = _bombDefuser.getTargetBlock(null, 5); - if (block == null || !_bomb.isBlock(block) || UtilMath.offset(_bombDefuser.getLocation(), block.getLocation().add(0.5, 0, 0.5)) > 3) + if (block == null || !_bomb.isBlock(block) || !_bombDefuser.isOnline() || UtilMath.offset(_bombDefuser.getLocation(), block.getLocation().add(0.5, 0, 0.5)) > 3) { _bombDefuser.setExp(0f); _bombDefuser = null;