Merge branch 'Myst_EVO'

This commit is contained in:
Mini-Chiss 2015-08-28 21:00:00 -07:00
commit 3f1c4d24b9

View File

@ -215,7 +215,7 @@ public class Evolution extends SoloGame
} }
//Double Kit //Double Kit
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.MONITOR)
public void storeTokens(GameStateChangeEvent event) public void storeTokens(GameStateChangeEvent event)
{ {
if (event.GetState() != GameState.Prepare) if (event.GetState() != GameState.Prepare)
@ -229,22 +229,6 @@ public class Evolution extends SoloGame
} }
} }
@EventHandler(priority = EventPriority.LOWEST)
public void setKit(GameStateChangeEvent event)
{
if (event.GetState() != GameState.Prepare)
return;
for (Player player : GetPlayers(true))
{
if (GetKit(player) != null)
continue;
this.SetKit(player, GetKits()[0], false);
}
}
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void showKit(GameStateChangeEvent event) public void showKit(GameStateChangeEvent event)
{ {