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

This commit is contained in:
Jonathan Williams 2014-08-01 00:46:34 -07:00
commit 874c1413a3
2 changed files with 2 additions and 2 deletions

View File

@ -979,7 +979,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener
if (ent.GetKit().GetAvailability() == KitAvailability.Free || //Free
donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + ent.GetKit().GetName()) || //Green
Manager.GetServerStatusManager().getCurrentServerName().toLowerCase().contains("free")) //Blue
!Manager.GetServerStatusManager().getCurrentServerName().toLowerCase().contains("free")) //Blue
{
entityName = ent.GetKit().GetAvailability().GetColor() + entityName;
}

View File

@ -318,7 +318,7 @@ public class GamePlayerManager implements Listener
if (kit.GetAvailability() == KitAvailability.Free || //Free
donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + kit.GetName()) || //Green
Manager.GetServerStatusManager().getCurrentServerName().toLowerCase().contains("free")) //Blue
!Manager.GetServerStatusManager().getCurrentServerName().toLowerCase().contains("free")) //Blue
{
Manager.GetGame().SetKit(player, kit, true);
}