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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2014-11-08 14:32:48 -08:00
commit 403165edf4
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java
View File

@ -341,7 +341,9 @@ public class SneakyAssassins extends SoloGame
if (event.GetState() == GameState.End || event.GetState() == GameState.Dead) if (event.GetState() == GameState.End || event.GetState() == GameState.Dead)
{ {
HandlerList.unregisterAll(_npcManager); HandlerList.unregisterAll(_npcManager);
HandlerList.unregisterAll(_powerUpManager);
_npcManager = null; _npcManager = null;
_powerUpManager = null;
} }
} }
} }

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/powerups/PowerUpManager.java
View File

@ -112,10 +112,6 @@ public class PowerUpManager implements Listener
case Live: case Live:
schedulePowerUpSpawn(20); schedulePowerUpSpawn(20);
break; break;
case Dead:
HandlerList.unregisterAll(this);
break;
} }
} }
} }
@ -135,16 +131,6 @@ public class PowerUpManager implements Listener
powerUp.onUpdate(event); powerUp.onUpdate(event);
} }
@EventHandler
public void deregisterSelf(UpdateEvent event)
{
if (event.getType() != UpdateType.TICK)
return;
if (_game.GetState() == GameState.Dead)
HandlerList.unregisterAll(this);
}
@EventHandler @EventHandler
public void onPowerUpProximity(UpdateEvent event) public void onPowerUpProximity(UpdateEvent event)
{ {