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

This commit is contained in:
Jonathan Williams 2014-08-09 09:41:07 -05:00
commit cfd1d868b5
2 changed files with 4 additions and 2 deletions

View File

@ -994,7 +994,8 @@ public class GameLobbyManager implements IPacketRunnable, Listener
if (ent.GetKit().GetAvailability() == KitAvailability.Free || //Free
donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + ent.GetKit().GetName()) || //Green
donor.OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA")) //Old - Single Game Ultra
donor.OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA") || //Old - Single Game Ultra
Manager.GetClients().Get(player).GetRank().Has(Rank.HELPER)) //STAFF
{
entityName = ent.GetKit().GetAvailability().GetColor() + entityName;
}

View File

@ -315,7 +315,8 @@ public class GamePlayerManager implements Listener
if (kit.GetAvailability() == KitAvailability.Free || //Free
donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + kit.GetName()) || //Green
donor.OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA")) //OLD - Single Game Ultras
donor.OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA") || //OLD - Single Game Ultras
Manager.GetClients().Get(player).GetRank().Has(Rank.HELPER)) //STAFF
{
Manager.GetGame().SetKit(player, kit, true);
}