Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex

Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java

@@ -34,7 +34,7 @@ public class NewsManager extends MiniPlugin
 		_news = new String[] 
 				{
 				"New SSM Kit: " + C.cYellow + C.Bold + "Skeletal Horse",
-				"Beta Servers Live! " + C.cPurple + C.Bold + "HERO ONLY",
+				"Beta Servers Live! " + C.cPurple + C.Bold + "ULTRA ONLY",
 				"Beta Game: " + C.cYellow + C.Bold + "Sheep Quest",
 				};
 	}

Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java

@@ -390,11 +390,15 @@ public class ServerManager extends MiniPlugin
 					if (partyPlayer == null)
 						continue;
 					
-					if ((serverInfo.Name.contains("BETA") && !_clientManager.Get(partyPlayer).GetRank().Has(Rank.HERO)))
+					if (serverInfo.Name.contains("BETA"))
 					{
+						if (!_clientManager.Get(partyPlayer).GetRank().Has(Rank.ULTRA))
 							continue;
 					}
 					
+					if (!_clientManager.Get(partyPlayer).GetRank().Has(Rank.MODERATOR) && serverInfo.CurrentPlayers >= serverInfo.MaxPlayers * 1.5)
+						continue;
+					
 					if (_clientManager.Get(partyPlayer).GetRank().Has(Rank.ULTRA) || _donationManager.Get(partyPlayer.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA"))
 						continue;
 					
@@ -411,11 +415,15 @@ public class ServerManager extends MiniPlugin
 					if (partyPlayer == null)
 						continue;
 					
-					if ((serverInfo.Name.contains("BETA") && !_clientManager.Get(partyPlayer).GetRank().Has(Rank.HERO)))
+					if (serverInfo.Name.contains("BETA"))
 					{
+						if (!_clientManager.Get(partyPlayer).GetRank().Has(Rank.ULTRA))
 							continue;
 					}
 					
+					if (!_clientManager.Get(partyPlayer).GetRank().Has(Rank.MODERATOR) && serverInfo.CurrentPlayers >= serverInfo.MaxPlayers * 1.5)
+						continue;
+					
 					if (_clientManager.Get(partyPlayer).GetRank().Has(Rank.ULTRA) || _donationManager.Get(partyPlayer.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA"))
 					{
 						partyPlayer.leaveVehicle();

Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java

@@ -63,13 +63,12 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 		int greenCount = 0;
 		int yellowCount = 0;
 		String openFull = ChatColor.RESET + C.Line + "Get Ultra to join full servers!";
-		String beta = ChatColor.RESET + C.Line + "Get Hero to join Beta servers!";
+		String beta = ChatColor.RESET + C.Line + "Get Ultra to join Beta servers!";
 		String openFullUltra = ChatColor.RESET + C.Line + "Click to join!";
 		
 		for (ServerInfo serverInfo : serverList)
 		{
 			boolean ownsUltraPackage = DonationManager.Get(Player.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA") || Client.GetRank().Has(Rank.ULTRA);
-			boolean hero = Client.GetRank().Has(Rank.HERO);
 			
 			String inProgress = (serverInfo.Game == null || serverInfo.ServerType.equalsIgnoreCase("Competitive")) ? (ChatColor.RESET + C.Line + "Game in progress.") : (ChatColor.RESET + C.Line + "Click to spectate");
 			String inProgressLine2 = (serverInfo.Game == null || serverInfo.ServerType.equalsIgnoreCase("Competitive")) ? null : (ChatColor.RESET + C.Line + "and wait for next game!");
@@ -99,7 +98,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 				lore.add(ChatColor.RESET + "");
 				lore.add(ChatColor.RESET + serverInfo.MOTD);
 				
-				if (serverInfo.Name.contains("BETA") && !hero)
+				if (serverInfo.Name.contains("BETA") && !ownsUltraPackage)
 				{
 					lore.add(beta);
 				}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java

@@ -19,18 +19,13 @@ import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
-import org.bukkit.entity.Chicken;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.IronGolem;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Skeleton;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockBurnEvent;
 import org.bukkit.event.block.BlockFadeEvent;
 import org.bukkit.event.block.BlockSpreadEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -39,9 +34,11 @@ import org.bukkit.event.server.ServerListPingEvent;
 import mineplex.minecraft.game.classcombat.Class.ClassManager;
 import mineplex.minecraft.game.classcombat.Class.IPvpClass;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.classcombat.itempack.ItemPackFactory;
 import mineplex.minecraft.game.classcombat.shop.ClassCombatCustomBuildShop;
 import mineplex.minecraft.game.classcombat.shop.ClassShopManager;
 import mineplex.minecraft.game.core.IRelation;
+import mineplex.minecraft.game.core.combat.CombatManager;
 import mineplex.minecraft.game.core.condition.ConditionManager;
 import mineplex.minecraft.game.core.condition.Condition.ConditionType;
 import mineplex.minecraft.game.core.damage.DamageManager;
@@ -58,7 +55,9 @@ import mineplex.core.common.util.*;
 import mineplex.core.creature.Creature;
 import mineplex.core.disguise.DisguiseManager;
 import mineplex.core.donation.DonationManager;
+import mineplex.core.movement.Movement;
 import mineplex.core.packethandler.PacketHandler;
+import mineplex.core.energy.Energy;
 import mineplex.core.explosion.Explosion;
 import mineplex.core.portal.Portal;
 import mineplex.core.projectile.ProjectileManager;
@@ -142,13 +141,14 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 
 		_projectileManager = new ProjectileManager(plugin);
 
-		/*
+		if (serverConfig.GameList.contains(GameType.Champions))
+		{
 			_skillFactory = new SkillFactory(plugin, damageManager, this, new CombatManager(plugin), conditionManager, _projectileManager, _blockRestore, _fire, new Movement(plugin), plugin.GetTeleport(), new Energy(plugin), webAddress);
 			_classManager = new ClassManager(plugin, clientManager, donationManager, _skillFactory, webAddress);		
 		
 			_classShopManager = new ClassShopManager(_plugin, _classManager, _skillFactory, new ItemPackFactory(_plugin));
 			_classCustomBuildShop = new ClassCombatCustomBuildShop(_classShopManager, clientManager, donationManager, webAddress);
-		 */
+		}
 		
 		//_statsManager = new StatsManager(plugin);
 		

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java

@@ -75,7 +75,7 @@ public class Champions extends TeamGame
 
 		this.DeathSpectateSecs = 8;
 		
-		//_shop = new ClassCombatCustomBuildShop(null, null, manager.GetDonation(), "Class Setup");
+		_shop = new ClassCombatCustomBuildShop(null, null, manager.GetDonation(), "Class Setup");
 	}
 
 	@Override
@@ -96,8 +96,7 @@ public class Champions extends TeamGame
 			_emerald.add(new Emerald(this, loc));
 		}
 
-		/* NPCs
+		/*
-
 		for (Location loc : WorldData.GetDataLocs("GRAY"))		//Knight
 			SpawnNPC(Knight, loc);
 
@@ -112,7 +111,6 @@ public class Champions extends TeamGame
 
 		for (Location loc : WorldData.GetDataLocs("ORANGE"))	//Mage
 			SpawnNPC(Mage, loc);
-
 		*/
 	}
 
@@ -122,11 +120,9 @@ public class Champions extends TeamGame
 		if (event.GetState() != GameState.Recruit)
 			return;
 
-		/*
 		for (GameTeam team : GetTeamList())
 			if (team.GetColor() == ChatColor.AQUA)
 				team.SetColor(ChatColor.BLUE);
-		 */
 	}
 
 	@EventHandler