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

Added ability for LT to modify Admin ranks. 

Added Twithc rank to the updateRank list.

Fixed server sorting issues with UHC Generating servers.
This commit is contained in:
Jonathan Williams 2015-05-13 00:58:45 -07:00
parent 98dcb9747a
commit 1c6a12528c
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
View File

@ -52,8 +52,14 @@ public class UpdateRank extends CommandBase<CoreClientManager>
final Rank rank = tempRank;
if (rank == Rank.YOUTUBE || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR)
if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR)
{
if (rank == Rank.ADMIN && !Plugin.hasRank(caller, Rank.LT))
{
UtilPlayer.message(caller, F.main(Plugin.getName(), ChatColor.RED + "" + ChatColor.BOLD + "Insufficient privileges!"));
return;
}
Plugin.getRepository().matchPlayerName(new Callback<List<String>>()
{
public void run(List<String> matches)

7
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerSorter.java
View File

@ -1,7 +1,10 @@
package mineplex.hub.server;
import java.awt.Color;
import java.util.Comparator;
import org.bukkit.ChatColor;
public class ServerSorter implements Comparator<ServerInfo>
{
private int _requiredSlots;
@ -29,8 +32,8 @@ public class ServerSorter implements Comparator<ServerInfo>
{
try
{
String aTime = a.MOTD.substring(a.MOTD.indexOf("(") + 1, a.MOTD.indexOf(")"));
String bTime = a.MOTD.substring(b.MOTD.indexOf("(") + 1, b.MOTD.indexOf(")"));
String aTime = ChatColor.stripColor(a.MOTD.substring(a.MOTD.indexOf("(") + 1, a.MOTD.indexOf(")")));
String bTime = ChatColor.stripColor(b.MOTD.substring(b.MOTD.indexOf("(") + 1, b.MOTD.indexOf(")")));
int timeOfA = (int)Double.parseDouble(aTime.split(" ")[0]) * (aTime.contains("Minute") ? 60 : 1);
int timeOfB = (int)Double.parseDouble(bTime.split(" ")[0]) * (bTime.contains("Minute") ? 60 : 1);

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

@ -327,7 +327,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
private boolean isStarting(ServerInfo serverInfo)
{
return (serverInfo.MOTD.contains("Starting") || serverInfo.MOTD.contains("Recruiting") || serverInfo.MOTD.contains("Waiting") || serverInfo.MOTD.contains("Open"));
return (serverInfo.MOTD.contains("Starting") || serverInfo.MOTD.contains("Recruiting") || serverInfo.MOTD.contains("Generating") || serverInfo.MOTD.contains("Waiting") || serverInfo.MOTD.contains("Open"));
}
private boolean isInProgress(ServerInfo serverInfo)

2
Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/MinecraftServer.java
View File

@ -96,7 +96,7 @@ public class MinecraftServer
public boolean isJoinable()
{
if (_motd != null && (_motd.contains("Starting") || _motd.contains("Recruiting")
|| _motd.contains("Waiting") || _motd.contains("Open in") || _motd.isEmpty()))
|| _motd.contains("Waiting") || _motd.contains("Open in") || _motd.isEmpty() || _motd.contains("Generating")))
{
if (_playerCount < _maxPlayerCount)
{

BIN
Website/LOCWebsite.suo
View File

Binary file not shown.