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 // 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 cf0756081..c0ee1bc8b 100644 Binary files a/Website/LOCWebsite.suo and b/Website/LOCWebsite.suo differ