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

This commit is contained in:
Jonathan Williams 2014-08-09 08:11:01 -05:00
parent dbf59a032b cac7f85410
commit dffc56e3e0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
View File

@ -993,7 +993,8 @@ public class GameLobbyManager implements IPacketRunnable, Listener
} }
if (ent.GetKit().GetAvailability() == KitAvailability.Free || //Free if (ent.GetKit().GetAvailability() == KitAvailability.Free || //Free
donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + ent.GetKit().GetName())) //Green or Blue donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + ent.GetKit().GetName()) || //Green
donor.OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA")) //Old - Single Game Ultra
{ {
entityName = ent.GetKit().GetAvailability().GetColor() + entityName; entityName = ent.GetKit().GetAvailability().GetColor() + entityName;
} }

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
View File

@ -314,7 +314,8 @@ public class GamePlayerManager implements Listener
Donor donor = Manager.GetDonation().Get(player.getName()); Donor donor = Manager.GetDonation().Get(player.getName());
if (kit.GetAvailability() == KitAvailability.Free || //Free if (kit.GetAvailability() == KitAvailability.Free || //Free
donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + kit.GetName())) //Green donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + kit.GetName()) || //Green
donor.OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA")) //OLD - Single Game Ultras
{ {
Manager.GetGame().SetKit(player, kit, true); Manager.GetGame().SetKit(player, kit, true);
} }