From 1e2dce46ad7097b4d05ebde0c449b46c8598c27b Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Sat, 23 Sep 2017 04:50:02 -0400 Subject: [PATCH] Tidy up issues from merge --- .../game/clans/clans/freeze/ClansFreezeManager.java | 7 +++++-- .../game/clans/clans/freeze/commands/PanicCommand.java | 3 +-- .../src/mineplex/clanshub/ClansTransferManager.java | 4 +--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/ClansFreezeManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/ClansFreezeManager.java index d5617c05f..11857393a 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/ClansFreezeManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/ClansFreezeManager.java @@ -55,6 +55,7 @@ public class ClansFreezeManager extends MiniPlugin { FREEZE_COMMAND, UNFREEZE_COMMAND, + PANIC_COMMAND, NOTIFY, } @@ -86,6 +87,8 @@ public class ClansFreezeManager extends MiniPlugin PermissionGroup.CMOD.setPermission(Perm.NOTIFY, false, true); PermissionGroup.CMA.setPermission(Perm.NOTIFY, false, 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 @@ -328,7 +331,7 @@ public class ClansFreezeManager extends MiniPlugin } 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!")); } @@ -362,7 +365,7 @@ public class ClansFreezeManager extends MiniPlugin } 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!")); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/commands/PanicCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/commands/PanicCommand.java index c58481b6c..1e60c10af 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/commands/PanicCommand.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/freeze/commands/PanicCommand.java @@ -3,7 +3,6 @@ package mineplex.game.clans.clans.freeze.commands; import org.bukkit.entity.Player; import mineplex.core.command.CommandBase; -import mineplex.core.common.Rank; import mineplex.game.clans.clans.freeze.ClansFreezeManager; /** @@ -13,7 +12,7 @@ public class PanicCommand extends CommandBase { public PanicCommand(ClansFreezeManager plugin) { - super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, "panic"); + super(plugin, ClansFreezeManager.Perm.PANIC_COMMAND, "panic"); } @Override diff --git a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansTransferManager.java b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansTransferManager.java index c54ac3804..79eeb1d44 100644 --- a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansTransferManager.java +++ b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansTransferManager.java @@ -107,9 +107,7 @@ public class ClansTransferManager extends MiniDbClientPlugin } 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 + "Don't know how to change your Minecraft version? Read Here:\n" - + C.cGreen + "http://www.mineplex.com/JOSH_URL_HERE")); + + C.cGray + "Please change your Minecraft version to 1.8.8 or 1.12+ and reconnect!")); return false; }