JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Jukebox will be removed.

This commit is contained in:
Chiss 2014-09-20 15:29:59 +10:00
parent be3e10a412
commit a830c72d22
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/SongData.java
View File

@ -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;
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
View File

@ -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;