From f1393ffb33cb6b73ff8fa31add99edbb5dae7f77 Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Wed, 2 Jul 2014 16:05:26 -0700
Subject: [PATCH] Fixed rankUpdate changing existing higher ranked players.

Fixed join limits in arcade and hub.
---
 .../src/mineplex/hub/HubManager.java          |   2 +-
 .../nautilus/game/arcade/ArcadeManager.java   |  17 -----------------
 .../Models/AccountAdministrator.cs            |   3 +++
 Website/LOCWebsite.suo                        | Bin 474624 -> 474624 bytes
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index 1fce65064..1c6b00910 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -252,7 +252,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
         // Reserved Slot Check
 		if (Bukkit.getOnlinePlayers().length >= Bukkit.getServer().getMaxPlayers())
 		{
-			if (!client.GetRank().Has(Rank.ULTRA))
+			if (!client.GetRank().Has(Rank.HELPER))
 			{
 				Bukkit.getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
 				{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
index b702d01c6..6edbe2e0c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -493,23 +493,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 				new String[] {"", ChatColor.RESET + "Click while holding this", ChatColor.RESET + "to return to the Hub."}));
 	}
 
-	@EventHandler
-	public void Login(PlayerLoginEvent event)
-	{
-		// Reserved Slot Check
-		if (Bukkit.getOnlinePlayers().length >= Bukkit.getServer().getMaxPlayers())
-		{
-			if (_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.ULTRA, false) || _donationManager.Get(event.getPlayer().getName()).OwnsUnknownPackage(_serverConfig.ServerType + " ULTRA"))
-			{
-				event.allow();
-				event.setResult(PlayerLoginEvent.Result.ALLOWED);
-				return;
-			}
-
-			event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server Full > Purchase Ultra at www.mineplex.com/shop");
-		}
-	}
-
 	public boolean IsAlive(Player player) 
 	{
 		if (_game == null) 
diff --git a/Website/LOC.Website.Common/Models/AccountAdministrator.cs b/Website/LOC.Website.Common/Models/AccountAdministrator.cs
index edc78e5ba..8ceeacb99 100644
--- a/Website/LOC.Website.Common/Models/AccountAdministrator.cs
+++ b/Website/LOC.Website.Common/Models/AccountAdministrator.cs
@@ -506,6 +506,9 @@
                 if (account == null)
                     return "ALL";
 
+                if (account.Rank.Name == "ADMIN" || account.Rank.Name == "OWNER" || account.Rank.Name == "DEVELOPER" || account.Rank.Name == "YOUTUBE")
+                    return token.Rank;
+
                 if (rank == null)
                     return account.Rank.ToString();
 
diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo
index cf0756081a83bfa4d5b33b8199194cd28bfb7e95..c0ee1bc8b613e7dfe67d444e5e9fc7079f4fe902 100644
GIT binary patch
delta 127
zcmZqpBh&ClW<w4O+kz#NBGslf7qPS#u`mKL6A&{4G0XNM7S>BkIeeKI7#x9kI-?Vl
z#`cm`tp1Xd53?9<|8ki19=Cv_yPhL=nVsaZ+0J=aF6@0fxiLv(dd_`ju5A}s4~ua!
V{s#hYnC|v3&sevAdB(;Q4gfgmFMI$1

delta 122
zcmZqpBh&ClW<w4O+lAAf$2U!CE@EjfVqpYgCLm@8VwUYiEUcH7a(FW_FgOD7bVes8
zjqN3?Sp6kg8GV5QlP|8&+5Y7)>pgCP83*RK?|$U4qW<2;_UQ{ek56t)5}BTJpP6gh
X1=ho2lMk~PwtsoXy8X*DHlA<*;E6D#