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

Reverted Trainee to Helper due to popular demand.

Browse Source
This commit is contained in:
Mysticate 2015-07-20 15:45:16 -04:00
parent 6addf00037
commit e55ca81d48
13 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ public class UpdateRank extends CommandBase<CoreClientManager>
final Rank rank = tempRank; final Rank rank = tempRank;
if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.TRAINEE || 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)) if (rank == Rank.ADMIN && !Plugin.hasRank(caller, Rank.LT))
{ {

4
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
View File

@ -323,7 +323,7 @@ public class Chat extends MiniPlugin
UtilPlayer.message(sender, F.main("Chat", "You are sending messages too fast.")); UtilPlayer.message(sender, F.main("Chat", "You are sending messages too fast."));
event.setCancelled(true); event.setCancelled(true);
} }
else if (!_clientManager.Get(sender).GetRank().Has(Rank.TRAINEE) && else if (!_clientManager.Get(sender).GetRank().Has(Rank.HELPER) &&
msgContainsHack(event.getMessage())) msgContainsHack(event.getMessage()))
{ {
UtilPlayer.message(sender, F.main("Chat", UtilPlayer.message(sender, F.main("Chat",
@ -337,7 +337,7 @@ public class Chat extends MiniPlugin
MessageData lastMessage = _playerLastMessage.get(sender.getUniqueId()); MessageData lastMessage = _playerLastMessage.get(sender.getUniqueId());
long chatSlowTime = 1000L * _chatSlow; long chatSlowTime = 1000L * _chatSlow;
long timeDiff = System.currentTimeMillis() - lastMessage.getTimeSent(); long timeDiff = System.currentTimeMillis() - lastMessage.getTimeSent();
if (timeDiff < chatSlowTime && !_clientManager.Get(sender).GetRank().Has(Rank.TRAINEE)) if (timeDiff < chatSlowTime && !_clientManager.Get(sender).GetRank().Has(Rank.HELPER))
{ {
UtilPlayer.message(sender, F.main("Chat", "Chat slow enabled. Please wait " + F.time(UtilTime.convertString(chatSlowTime - timeDiff, 1, UtilTime.TimeUnit.FIT)))); UtilPlayer.message(sender, F.main("Chat", "Chat slow enabled. Please wait " + F.time(UtilTime.convertString(chatSlowTime - timeDiff, 1, UtilTime.TimeUnit.FIT))));
event.setCancelled(true); event.setCancelled(true);

2
Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
View File

@ -251,7 +251,7 @@ public class FriendManager extends MiniDbClientPlugin<FriendData>
public void showFriends(Player caller) public void showFriends(Player caller)
{ {
boolean isStaff = ClientManager.Get(caller).GetRank().Has(Rank.TRAINEE); boolean isStaff = ClientManager.Get(caller).GetRank().Has(Rank.HELPER);
boolean gotAFriend = false; boolean gotAFriend = false;
List<FriendStatus> friendStatuses = Get(caller).getFriends(); List<FriendStatus> friendStatuses = Get(caller).getFriends();
Collections.sort(friendStatuses, _friendSorter); Collections.sort(friendStatuses, _friendSorter);

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java
View File

@ -3,7 +3,6 @@ package mineplex.core.gadget.gadgets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.MapUtil; import mineplex.core.common.util.MapUtil;
import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilBlock;
@ -64,6 +63,7 @@ public class BlockForm
DisguiseChicken disguise = new DisguiseChicken(_player); DisguiseChicken disguise = new DisguiseChicken(_player);
disguise.setBaby(); disguise.setBaby();
disguise.setSoundDisguise(new DisguiseCat(_player)); disguise.setSoundDisguise(new DisguiseCat(_player));
disguise.setInvisible(true);
_host.Manager.getDisguiseManager().disguise(disguise); _host.Manager.getDisguiseManager().disguise(disguise);
//Apply Falling Block //Apply Falling Block

2
Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
View File

@ -88,7 +88,7 @@ public class IgnoreManager extends MiniDbClientPlugin<IgnoreData>
@EventHandler @EventHandler
public void onChat(AsyncPlayerChatEvent event) public void onChat(AsyncPlayerChatEvent event)
{ {
if (ClientManager.Get(event.getPlayer()).GetRank().Has(Rank.TRAINEE)) if (ClientManager.Get(event.getPlayer()).GetRank().Has(Rank.HELPER))
return; return;
Iterator<Player> itel = event.getRecipients().iterator(); Iterator<Player> itel = event.getRecipients().iterator();

8
Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
View File

@ -191,7 +191,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
// My attempt at trying to mitigate some of the spam bots - Phinary // My attempt at trying to mitigate some of the spam bots - Phinary
// Triggers if they are whispering a new player // Triggers if they are whispering a new player
if (!GetClientManager().Get(from).GetRank().Has(Rank.TRAINEE) && Get(from).LastTo != null if (!GetClientManager().Get(from).GetRank().Has(Rank.HELPER) && Get(from).LastTo != null
&& !Get(from).LastTo.equalsIgnoreCase(to.getName())) && !Get(from).LastTo.equalsIgnoreCase(to.getName()))
{ {
long delta = System.currentTimeMillis() - Get(from).LastToTime; long delta = System.currentTimeMillis() - Get(from).LastToTime;
@ -247,7 +247,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
{ {
if (!to.equals(staff) && !from.equals(staff)) if (!to.equals(staff) && !from.equals(staff))
{ {
if (_clientManager.Get(staff).GetRank().Has(Rank.TRAINEE)) if (_clientManager.Get(staff).GetRank().Has(Rank.HELPER))
{ {
UtilPlayer.message(staff, F.rank(_clientManager.Get(from).GetRank()) + " " + from.getName() + C.cPurple UtilPlayer.message(staff, F.rank(_clientManager.Get(from).GetRank()) + " " + from.getName() + C.cPurple
+ " -> " + F.rank(_clientManager.Get(to).GetRank()) + " " + to.getName() + " " + C.cPurple + message); + " -> " + F.rank(_clientManager.Get(to).GetRank()) + " " + to.getName() + " " + C.cPurple + message);
@ -364,7 +364,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
{ {
if (!to.equals(staff)) if (!to.equals(staff))
{ {
if (_clientManager.Get(staff).GetRank().Has(Rank.TRAINEE)) if (_clientManager.Get(staff).GetRank().Has(Rank.HELPER))
{ {
UtilPlayer.message(staff, UtilPlayer.message(staff,
@ -442,7 +442,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
{ {
if (!target.equals(staff)) if (!target.equals(staff))
{ {
if (_clientManager.Get(staff).GetRank().Has(Rank.TRAINEE)) if (_clientManager.Get(staff).GetRank().Has(Rank.HELPER))
{ {
UtilPlayer.message(staff, UtilPlayer.message(staff,

2
Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java
View File

@ -48,7 +48,7 @@ public class AdminCommand extends CommandBase<MessageManager>
boolean staff = false; boolean staff = false;
for (Player to : UtilServer.getPlayers()) for (Player to : UtilServer.getPlayers())
{ {
if (Plugin.GetClientManager().Get(to).GetRank().Has(Rank.TRAINEE)) if (Plugin.GetClientManager().Get(to).GetRank().Has(Rank.HELPER))
{ {
if (!to.equals(caller)) if (!to.equals(caller))
UtilPlayer.message(to, F.rank(Plugin.GetClientManager().Get(caller).GetRank()) + " " + caller.getName() + " " + C.cPurple + message); UtilPlayer.message(to, F.rank(Plugin.GetClientManager().Get(caller).GetRank()) + " " + caller.getName() + " " + C.cPurple + message);

2
Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java
View File

@ -24,7 +24,7 @@ public class MessageAdminCommand extends CommandBase<MessageManager>
} }
else else
{ {
if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.TRAINEE, true)) if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.HELPER, true))
return; return;
if (args.length == 0) if (args.length == 0)

2
Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java
View File

@ -24,7 +24,7 @@ public class ResendAdminCommand extends CommandBase<MessageManager>
} }
else else
{ {
if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.TRAINEE, true)) if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.HELPER, true))
return; return;
String lastTo = Plugin.Get(caller).LastAdminTo; String lastTo = Plugin.Get(caller).LastAdminTo;

2
Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
View File

@ -72,7 +72,7 @@ public class ServerCommand extends CommandBase<Portal>
} }
else if (servUp.contains("STAFF")) else if (servUp.contains("STAFF"))
{ {
if (playerRank.Has(Rank.TRAINEE)) if (playerRank.Has(Rank.HELPER))
Plugin.sendPlayerToServer(player, args[0]); Plugin.sendPlayerToServer(player, args[0]);
else else
deniedAccess = true; deniedAccess = true;

2
Plugins/Mineplex.Core/src/mineplex/core/punish/Command/PunishCommand.java
View File

@ -19,7 +19,7 @@ public class PunishCommand extends CommandBase<Punish>
{ {
public PunishCommand(Punish plugin) public PunishCommand(Punish plugin)
{ {
super(plugin, Rank.TRAINEE, "punish", "p"); super(plugin, Rank.HELPER, "punish", "p");
} }
@Override @Override

2
Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
View File

@ -214,7 +214,7 @@ public class Punish extends MiniPlugin
{ {
for (Player player : UtilServer.getPlayers()) for (Player player : UtilServer.getPlayers())
{ {
if (_clientManager.Get(player).GetRank().Has(Rank.TRAINEE) || player.getName().equals(punishee)) if (_clientManager.Get(player).GetRank().Has(Rank.HELPER) || player.getName().equals(punishee))
{ {
player.sendMessage(msg); player.sendMessage(msg);
} }

2
Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
View File

@ -56,7 +56,7 @@ public class ServerConfiguration extends MiniPlugin
@EventHandler @EventHandler
public void onPlayerLogin(PlayerLoginEvent event) public void onPlayerLogin(PlayerLoginEvent event)
{ {
if (_serverGroup.getStaffOnly() && !_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.TRAINEE, false)) if (_serverGroup.getStaffOnly() && !_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.HELPER, false))
event.disallow(Result.KICK_OTHER, "This is a staff only server."); event.disallow(Result.KICK_OTHER, "This is a staff only server.");
} }