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

Tidy up issues from merge

This commit is contained in:
AlexTheCoder 2017-09-23 04:50:02 -04:00
parent 333c632030
commit 1e2dce46ad
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/ClansFreezeManager.java
View File

@ -55,6 +55,7 @@ public class ClansFreezeManager extends MiniPlugin
{ {
FREEZE_COMMAND, FREEZE_COMMAND,
UNFREEZE_COMMAND, UNFREEZE_COMMAND,
PANIC_COMMAND,
NOTIFY, NOTIFY,
} }
@ -86,6 +87,8 @@ public class ClansFreezeManager extends MiniPlugin
PermissionGroup.CMOD.setPermission(Perm.NOTIFY, false, true); PermissionGroup.CMOD.setPermission(Perm.NOTIFY, false, true);
PermissionGroup.CMA.setPermission(Perm.NOTIFY, false, true); PermissionGroup.CMA.setPermission(Perm.NOTIFY, false, true);
PermissionGroup.ADMIN.setPermission(Perm.NOTIFY, true, true); PermissionGroup.ADMIN.setPermission(Perm.NOTIFY, true, true);
PermissionGroup.CONTENT.setPermission(Perm.PANIC_COMMAND, true, true);
PermissionGroup.ADMIN.setPermission(Perm.PANIC_COMMAND, true, true);
} }
@Override @Override
@ -328,7 +331,7 @@ public class ClansFreezeManager extends MiniPlugin
} }
for (Player alert : UtilServer.GetPlayers()) for (Player alert : UtilServer.GetPlayers())
{ {
if (_clientManager.Get(alert).GetRank().has(null, Rank.ADMIN, new Rank[] {Rank.CMOD, Rank.CMA}, false)) if (_clientManager.Get(alert).hasPermission(Perm.NOTIFY))
{ {
UtilPlayer.message(alert, F.main(getName(), F.elem(player.getName()) + " has entered panic mode!")); UtilPlayer.message(alert, F.main(getName(), F.elem(player.getName()) + " has entered panic mode!"));
} }
@ -362,7 +365,7 @@ public class ClansFreezeManager extends MiniPlugin
} }
for (Player alert : UtilServer.GetPlayers()) for (Player alert : UtilServer.GetPlayers())
{ {
if (_clientManager.Get(alert).GetRank().has(null, Rank.ADMIN, new Rank[] {Rank.CMOD, Rank.CMA}, false)) if (_clientManager.Get(alert).hasPermission(Perm.NOTIFY))
{ {
UtilPlayer.message(alert, F.main(getName(), F.elem(player.getName()) + " has exited panic mode!")); UtilPlayer.message(alert, F.main(getName(), F.elem(player.getName()) + " has exited panic mode!"));
} }

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/commands/PanicCommand.java
View File

@ -3,7 +3,6 @@ package mineplex.game.clans.clans.freeze.commands;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineplex.core.command.CommandBase; import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.game.clans.clans.freeze.ClansFreezeManager; import mineplex.game.clans.clans.freeze.ClansFreezeManager;
/** /**
@ -13,7 +12,7 @@ public class PanicCommand extends CommandBase<ClansFreezeManager>
{ {
public PanicCommand(ClansFreezeManager plugin) public PanicCommand(ClansFreezeManager plugin)
{ {
super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, "panic"); super(plugin, ClansFreezeManager.Perm.PANIC_COMMAND, "panic");
} }
@Override @Override

4
Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansTransferManager.java
View File

@ -107,9 +107,7 @@ public class ClansTransferManager extends MiniDbClientPlugin<SimpleClanToken>
} }
UtilPlayer.message(player, F.main(getName(), "Minecraft Version " + VERSION_NAMES.get(protocol) + " is not supported on Mineplex Clans.\n" UtilPlayer.message(player, F.main(getName(), "Minecraft Version " + VERSION_NAMES.get(protocol) + " is not supported on Mineplex Clans.\n"
+ C.cGray + "Please change your Minecraft version to 1.8.8 or 1.12+ and reconnect!\n" + C.cGray + "Please change your Minecraft version to 1.8.8 or 1.12+ and reconnect!"));
+ C.cGray + "Don't know how to change your Minecraft version? Read Here:\n"
+ C.cGreen + "http://www.mineplex.com/JOSH_URL_HERE"));
return false; return false;
} }