From e13f0c9a6ad7cc38b1b81a4dfd4baeb25c19f2fc Mon Sep 17 00:00:00 2001 From: wingzero54 Date: Sat, 13 Mar 2021 09:06:06 -0600 Subject: [PATCH 1/2] Disable merge command --- .../namelayer-spigot/src/main/resources/plugin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/namelayer-paper/namelayer-spigot/src/main/resources/plugin.yml b/plugins/namelayer-paper/namelayer-spigot/src/main/resources/plugin.yml index 6bbe708ee..5501d9836 100644 --- a/plugins/namelayer-paper/namelayer-spigot/src/main/resources/plugin.yml +++ b/plugins/namelayer-paper/namelayer-spigot/src/main/resources/plugin.yml @@ -35,8 +35,8 @@ commands: aliases: [nllistpermissions, nllistperms, listpermissions] nlpp: aliases: [nlpromoteplayer, nlpromote, promoteplayer, ctpromote, ctaddmod, ctam, addmod] - nlmg: - aliases: [nlmergegroups, nlmerge, mergegroup, mergegroups, merge] + #nlmg: + #aliases: [nlmergegroups, nlmerge, mergegroup, mergegroups, merge] nlmp: aliases: [nlmodifyperms, nlmodifypermissions, nlmodperms, modifypermissions] nlrm: From 3a6cd4d4ab58e4b327737ebfce2377fe8838e9fb Mon Sep 17 00:00:00 2001 From: wingzero54 Date: Sat, 13 Mar 2021 09:07:55 -0600 Subject: [PATCH 2/2] Disable merge command --- .../java/vg/civcraft/mc/namelayer/command/CommandHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/namelayer-paper/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/CommandHandler.java b/plugins/namelayer-paper/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/CommandHandler.java index 4cd0585bf..0b78a4f79 100644 --- a/plugins/namelayer-paper/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/CommandHandler.java +++ b/plugins/namelayer-paper/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/CommandHandler.java @@ -57,7 +57,7 @@ public class CommandHandler { addCommands(new ListGroups("ListGroups")); addCommands(new ListMembers("ListMembers")); addCommands(new ListPermissions("ListPermissions")); - addCommands(new MergeGroups("MergeGroups")); + //addCommands(new MergeGroups("MergeGroups")); Disabled as it's currently semi broken addCommands(new ModifyPermissions("ModifyPermissions")); addCommands(new RemoveMember("RemoveMember")); addCommands(new SetPassword("SetPassword"));