From a826501742ca68fc3a8db8eeaf61d6b1acb44257 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 22 Jun 2018 00:26:08 +0100 Subject: [PATCH] Add QAT, STM and MA ranks. Removed TM and MC --- .../mineplex/core/account/permissions/PermissionGroup.java | 7 ++++--- .../disguise/playerdisguise/PlayerDisguiseManager.java | 4 +--- Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java | 2 +- .../Mineplex.Core/src/mineplex/core/teleport/Teleport.java | 4 ++-- .../src/nautilus/game/arcade/ArcadeManager.java | 1 + 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/permissions/PermissionGroup.java b/Plugins/Mineplex.Core/src/mineplex/core/account/permissions/PermissionGroup.java index a4c0de68a..40f73ee2b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/permissions/PermissionGroup.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/permissions/PermissionGroup.java @@ -48,11 +48,12 @@ public enum PermissionGroup OWNER("owner", "Owner", "Owners are the core managers of Mineplex. \nEach owner manages a different aspect of the \nserver and ensures its efficient operation.", ChatColor.DARK_RED, 55, true, PermissionGroup.LT), //SUB-GROUPS - QA("qa", "", "Members of the Quality Assurance team.", ChatColor.WHITE, 50, false), + QAT("qat", "", "Members of the Quality Assurance Testing team.", ChatColor.WHITE, 50, false), + QA("qa", "", "Members of the Quality Assurance team.", ChatColor.WHITE, 50, false, PermissionGroup.QAT), QAM("qam", "", "Managers of the Quality Assurance team.", ChatColor.WHITE, 50, false, PermissionGroup.QA), CMOD("cmod", "", "Members of the Clans Management team.", ChatColor.WHITE, 46, false), - TM("tm", "", "Members of the Trainee Management team.", ChatColor.WHITE, 52, false), - MC("mc", "", "Members of the Moderator Coordination team.", ChatColor.WHITE, 49, false), + MA("ma", "", "Members of the Mentoring Assistance team.", ChatColor.WHITE, 52, false), + STM("stm", "", "Members of the Staff Management team.", ChatColor.WHITE, 52, false, PermissionGroup.MA), EVENTMOD("eventmod", "", "Members of the Event Management team.", ChatColor.WHITE, -1, false), CMA("cma", "", "Members of the Clans Management Assistance team.", ChatColor.WHITE, -1, false), RC("rc", "", "Members of the Rules Committee team.", ChatColor.WHITE, 35, false), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java index aff706bb8..bd5743745 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java @@ -156,9 +156,7 @@ public class PlayerDisguiseManager extends MiniPlugin implements IPacketHandler private void generatePermissions() { - - PermissionGroup.TM.setPermission(Perm.USE_DISGUISE, false, true); - PermissionGroup.MC.setPermission(Perm.USE_DISGUISE, false, true); + PermissionGroup.STM.setPermission(Perm.USE_DISGUISE, false, true); PermissionGroup.CONTENT.setPermission(Perm.USE_DISGUISE, true, true); PermissionGroup.CONTENT.setPermission(Perm.BLOCKED_DISGUISE, true, true); PermissionGroup.BUILDER.setPermission(Perm.BLOCKED_DISGUISE, true, true); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java index 13ab0efe0..79110f370 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java @@ -99,7 +99,7 @@ public class Punish extends MiniPlugin PermissionGroup.RC.setPermission(Perm.PUNISHMENT_REAPPLY, false, true); PermissionGroup.ADMIN.setPermission(Perm.PUNISHMENT_REAPPLY, true, true); - PermissionGroup.TM.setPermission(Perm.BYPASS_REMOVE_CONFIRMATION, false, true); + PermissionGroup.MA.setPermission(Perm.BYPASS_REMOVE_CONFIRMATION, false, true); PermissionGroup.FN.setPermission(Perm.BYPASS_REMOVE_CONFIRMATION, false, true); PermissionGroup.ADMIN.setPermission(Perm.BYPASS_REMOVE_CONFIRMATION, true, true); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java index d29d823da..fbc4cec7f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java @@ -163,9 +163,9 @@ public class Teleport extends MiniPlugin private void generatePermissions() { PermissionGroup.TRAINEE.setPermission(Perm.FIND_COMMAND, true, true); - PermissionGroup.MC.setPermission(Perm.FIND_MOD_COMMAND, false, true); + PermissionGroup.MA.setPermission(Perm.FIND_MOD_COMMAND, false, true); PermissionGroup.ADMIN.setPermission(Perm.FIND_MOD_COMMAND, true, true); - PermissionGroup.TM.setPermission(Perm.FIND_TRAINEE_COMMAND, false, true); + PermissionGroup.MA.setPermission(Perm.FIND_TRAINEE_COMMAND, false, true); PermissionGroup.ADMIN.setPermission(Perm.FIND_TRAINEE_COMMAND, true, true); PermissionGroup.TRAINEE.setPermission(Perm.TELEPORT_COMMAND, true, true); PermissionGroup.ADMIN.setPermission(Perm.TELEPORT_LOCATION_COMMAND, true, true); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index 20be27799..4f4070ef5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -625,6 +625,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation if (UtilServer.isTestServer()) { + PermissionGroup.QAT.setPermission(Perm.KIT_UNLOCK_COMMAND, true, true); PermissionGroup.QA.setPermission(Perm.GAME_COMMAND, true, true); PermissionGroup.MAPLEAD.setPermission(Perm.GAME_COMMAND, false, true); }