From 706fbd8792b7b7e2dab0e9968a0ddaa7309e6f6f Mon Sep 17 00:00:00 2001 From: Brianna Date: Thu, 19 Mar 2020 12:32:26 -0400 Subject: [PATCH] Fixed some nasty command mistakes. --- .../epicbosses/commands/CommandCreate.java | 3 +- .../epicbosses/commands/CommandDebug.java | 7 ++-- .../epicbosses/commands/CommandGiveEgg.java | 2 +- .../epicbosses/commands/CommandList.java | 2 +- .../epicbosses/commands/CommandMenu.java | 4 +-- .../epicbosses/commands/CommandShop.java | 2 +- .../epicbosses/commands/CommandSkills.java | 2 +- .../songoda/epicbosses/utils/Permission.java | 36 ------------------- 8 files changed, 10 insertions(+), 48 deletions(-) delete mode 100644 plugin-modules/Core/src/com/songoda/epicbosses/utils/Permission.java diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java index df85405..ac0c059 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java @@ -6,7 +6,6 @@ import com.songoda.epicbosses.container.BossEntityContainer; import com.songoda.epicbosses.entity.BossEntity; import com.songoda.epicbosses.utils.EntityFinder; import com.songoda.epicbosses.utils.Message; -import com.songoda.epicbosses.utils.Permission; import com.songoda.epicbosses.utils.StringUtils; import org.bukkit.command.CommandSender; import org.bukkit.entity.EntityType; @@ -88,7 +87,7 @@ public class CommandCreate extends AbstractCommand { @Override public String getSyntax() { - return "create <[>name> "; + return "create "; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java index 719061f..9142ee7 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java @@ -3,7 +3,6 @@ package com.songoda.epicbosses.commands; import com.songoda.core.commands.AbstractCommand; import com.songoda.epicbosses.managers.DebugManager; import com.songoda.epicbosses.utils.Message; -import com.songoda.epicbosses.utils.Permission; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -47,16 +46,16 @@ public class CommandDebug extends AbstractCommand { @Override public String getPermissionNode() { - return "boss.reload"; + return "boss.debug"; } @Override public String getSyntax() { - return "reload"; + return "debug"; } @Override public String getDescription() { - return "Reloads EpicBosses and its configurations."; + return "Toggles on and off the debug mode."; } } diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java index b38fd62..85907a5 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java @@ -105,7 +105,7 @@ public class CommandGiveEgg extends AbstractCommand { @Override public String getSyntax() { - return "giveegg [amount]"; + return "give/giveegg [amount]"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java index 2c81c89..21708cb 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java @@ -39,7 +39,7 @@ public class CommandList extends AbstractCommand { @Override public String getSyntax() { - return "list"; + return "list/show"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java index cb02167..5576216 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java @@ -34,12 +34,12 @@ public class CommandMenu extends AbstractCommand { @Override public String getPermissionNode() { - return "menu"; + return "boss.menu"; } @Override public String getSyntax() { - return null; + return "menu"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java index fd79b30..7578dc6 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java @@ -46,7 +46,7 @@ public class CommandShop extends AbstractCommand { @Override public String getSyntax() { - return "shop"; + return "shop/buy/store"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java index 3bc1eeb..cb740c5 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java @@ -39,7 +39,7 @@ public class CommandSkills extends AbstractCommand { @Override public String getSyntax() { - return "skills"; + return "skills/skill"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/Permission.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/Permission.java deleted file mode 100644 index 369eaee..0000000 --- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/Permission.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.songoda.epicbosses.utils; - -import org.bukkit.command.CommandSender; - -/** - * @author Charles Cullen - * @version 1.0.0 - * @since 04-Oct-18 - */ -public enum Permission { - - admin("boss.admin"), - create("boss.create"), - debug("boss.debug"), - edit("boss.edit"), - give("boss.give"), - help("boss.help"), - nearby("boss.nearby"), - reload("boss.reload"), - shop("boss.shop"), - time("boss.time"); - - private String permission; - - Permission(String permission) { - this.permission = permission; - } - - public boolean hasPermission(CommandSender commandSender) { - return commandSender.hasPermission(getPermission()); - } - - public String getPermission() { - return this.permission; - } -}