JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted change to helper only joining full, now ultras can. 

Added check so BETA servers cannot be joined by less than Helper.

Fixed message in AccountAdministrator for rankUpdate
This commit is contained in:
Jonathan Williams 2014-07-02 16:59:31 -07:00
parent 8eaad57516
commit d0fafce585
5 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
View File

@ -196,7 +196,7 @@ public class CoreClientManager extends MiniPlugin
// Reserved Slot Check
if (Bukkit.getOnlinePlayers().length >= Bukkit.getServer().getMaxPlayers())
{
if (client.GetRank().Has(event.getPlayer(), Rank.HELPER, false))
if (client.GetRank().Has(event.getPlayer(), Rank.ULTRA, false))
{
event.allow();
event.setResult(PlayerLoginEvent.Result.ALLOWED);

2
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -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.HELPER))
if (!client.GetRank().Has(Rank.ULTRA))
{
Bukkit.getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
{

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

@ -103,6 +103,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
private GameLobbyManager _gameLobbyManager;
private GameStatsManager _gameStatsManager;
private GameWorldManager _gameWorldManager;
private ServerStatusManager _serverStatusManager;
private StatsManager _statsManager;
private ClassManager _classManager;
@ -153,8 +154,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
}
_clientManager = clientManager;
_chat = new Chat(plugin, _clientManager, preferences, serverStatusManager.getCurrentServerName());
_serverStatusManager = serverStatusManager;
_chat = new Chat(plugin, _clientManager, preferences, _serverStatusManager.getCurrentServerName());
_creature = creature;
@ -493,6 +494,32 @@ 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 (_serverStatusManager.getCurrentServerName().contains("BETA"))
{
if (_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.HELPER, false))
{
event.allow();
event.setResult(PlayerLoginEvent.Result.ALLOWED);
return;
}
}
else 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)

2
Website/LOC.Website.Common/Models/AccountAdministrator.cs
View File

@ -507,7 +507,7 @@
return "ALL";
if (account.Rank.Name == "ADMIN" || account.Rank.Name == "OWNER" || account.Rank.Name == "DEVELOPER" || account.Rank.Name == "YOUTUBE")
return token.Rank;
return account.Rank.Name;
if (rank == null)
return account.Rank.ToString();

8
Website/LOC.Website.Web/LOC.Website.Web.Publish.xml
View File

@ -614,7 +614,7 @@
<file relUrl="Content/css/bootstrap-responsive.css" publishTime="11/02/2013 13:30:01" />
<file relUrl="Areas/Manage/Views/Web.config" publishTime="11/02/2013 13:30:01" />
<file relUrl="Views/Home/Index.cshtml" publishTime="03/19/2014 02:41:15" />
<file relUrl="bin/LOC.Website.Common.dll" publishTime="07/01/2014 20:41:29" />
<file relUrl="bin/LOC.Website.Common.dll" publishTime="07/02/2014 16:18:03" />
<file relUrl="Content/themes/techno/js/prototype.js" publishTime="11/02/2013 13:30:01" />
<file relUrl="Scripts/jquery-1.4.4.min.js" publishTime="11/02/2013 13:30:01" />
<file relUrl="Content/Images/Double.png" publishTime="11/02/2013 13:30:01" />
@ -623,7 +623,7 @@
<file relUrl="bin/EntityFramework.xml" publishTime="11/02/2013 13:30:01" />
<file relUrl="Content/Images/Wiki/Ranger.png" publishTime="11/02/2013 13:30:01" />
<file relUrl="Content/themes/techno/images/templatemo_image_02.png" publishTime="11/02/2013 13:30:01" />
<file relUrl="bin/LOC.Website.Common.pdb" publishTime="07/01/2014 20:41:29" />
<file relUrl="bin/LOC.Website.Common.pdb" publishTime="07/02/2014 16:18:03" />
<file relUrl="bin/LOC.Core.pdb" publishTime="07/01/2014 20:41:29" />
<file relUrl="Content/Images/Wiki/red_dye.jpg" publishTime="11/02/2013 13:30:01" />
<file relUrl="Scripts/MicrosoftMvcValidation.js" publishTime="11/02/2013 13:30:01" />
@ -695,9 +695,9 @@
<file relUrl="Views/Store/_WritePackage.cshtml" publishTime="11/02/2013 13:30:01" />
<file relUrl="Content/css/bootstrap-responsive.min.css" publishTime="11/02/2013 13:30:01" />
<file relUrl="Views/Servers/Index.cshtml" publishTime="11/02/2013 13:30:01" />
<file relUrl="bin/LOC.Website.Web.dll" publishTime="07/01/2014 20:41:30" />
<file relUrl="bin/LOC.Website.Web.dll" publishTime="07/02/2014 16:18:03" />
<file relUrl="Views/Shared/_FrontLayout.cshtml" publishTime="11/02/2013 13:30:01" />
<file relUrl="bin/LOC.Website.Web.pdb" publishTime="07/01/2014 20:41:30" />
<file relUrl="bin/LOC.Website.Web.pdb" publishTime="07/02/2014 16:18:03" />
<file relUrl="Content/themes/base/images/ui-bg_glass_65_ffffff_1x400.png" publishTime="11/02/2013 13:30:01" />
<file relUrl="Views/Profile/Index.cshtml" publishTime="11/02/2013 13:30:01" />
<file relUrl="bin/WebMatrix.WebData.xml" publishTime="11/02/2013 13:30:01" />