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

This commit is contained in:
Cheese 2015-07-07 10:44:37 +10:00
commit a1ff9c75b2
2 changed files with 6 additions and 1 deletions

View File

@ -54,4 +54,9 @@ public abstract class Perk implements Listener
{ {
//Null Default //Null Default
} }
public void registeredEvents()
{
// When listener has been registered
}
} }

View File

@ -307,7 +307,7 @@ public class GameManager implements Listener
event.GetGame().RegisterKits(); event.GetGame().RegisterKits();
} }
@EventHandler @EventHandler(priority = EventPriority.HIGH)
public void KitDeregister(GameStateChangeEvent event) public void KitDeregister(GameStateChangeEvent event)
{ {
if (event.GetState() != GameState.Dead) if (event.GetState() != GameState.Dead)