From 67afdd7efba10af94061e54adfdbfda30555e03f Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 2 Jul 2019 19:27:51 -0700 Subject: [PATCH] Static Abuse Removal - Command package done for now --- .../nossr50/commands/AbilityToggleCommand.java | 4 +--- .../com/gmail/nossr50/commands/GodModeCommand.java | 4 +--- .../nossr50/commands/RefreshCooldownsCommand.java | 4 +--- ....java => ResetUserHealthBarSettingsCommand.java} | 4 ++-- .../com/gmail/nossr50/commands/ToggleCommand.java | 13 +++++++++++-- .../gmail/nossr50/commands/chat/ChatCommand.java | 4 ++-- .../gmail/nossr50/commands/chat/ChatSpyCommand.java | 4 +--- .../gmail/nossr50/commands/skills/SkillCommand.java | 2 +- .../util/commands/CommandRegistrationManager.java | 2 +- 9 files changed, 21 insertions(+), 20 deletions(-) rename src/main/java/com/gmail/nossr50/commands/{MHDCommand.java => ResetUserHealthBarSettingsCommand.java} (93%) diff --git a/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java b/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java index c13328e3c..1029a200d 100644 --- a/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java @@ -7,10 +7,8 @@ import org.bukkit.command.CommandSender; public class AbilityToggleCommand extends ToggleCommand { - private mcMMO pluginRef; - public AbilityToggleCommand(mcMMO pluginRef) { - this.pluginRef = pluginRef; + super(pluginRef); } @Override diff --git a/src/main/java/com/gmail/nossr50/commands/GodModeCommand.java b/src/main/java/com/gmail/nossr50/commands/GodModeCommand.java index edeb3136d..0d8de4ada 100644 --- a/src/main/java/com/gmail/nossr50/commands/GodModeCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/GodModeCommand.java @@ -7,10 +7,8 @@ import org.bukkit.command.CommandSender; public class GodModeCommand extends ToggleCommand { - private mcMMO pluginRef; - public GodModeCommand(mcMMO pluginRef) { - this.pluginRef = pluginRef; + super(pluginRef); } @Override diff --git a/src/main/java/com/gmail/nossr50/commands/RefreshCooldownsCommand.java b/src/main/java/com/gmail/nossr50/commands/RefreshCooldownsCommand.java index b67841a72..e50981a8f 100644 --- a/src/main/java/com/gmail/nossr50/commands/RefreshCooldownsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/RefreshCooldownsCommand.java @@ -7,10 +7,8 @@ import org.bukkit.command.CommandSender; public class RefreshCooldownsCommand extends ToggleCommand { - private mcMMO pluginRef; - public RefreshCooldownsCommand(mcMMO pluginRef) { - this.pluginRef = pluginRef; + super(pluginRef); } @Override diff --git a/src/main/java/com/gmail/nossr50/commands/MHDCommand.java b/src/main/java/com/gmail/nossr50/commands/ResetUserHealthBarSettingsCommand.java similarity index 93% rename from src/main/java/com/gmail/nossr50/commands/MHDCommand.java rename to src/main/java/com/gmail/nossr50/commands/ResetUserHealthBarSettingsCommand.java index 046f4a1da..16eb53802 100644 --- a/src/main/java/com/gmail/nossr50/commands/MHDCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/ResetUserHealthBarSettingsCommand.java @@ -12,11 +12,11 @@ import org.bukkit.command.TabExecutor; import java.util.List; -public class MHDCommand implements TabExecutor { +public class ResetUserHealthBarSettingsCommand implements TabExecutor { private mcMMO pluginRef; - public MHDCommand(mcMMO pluginRef) { + public ResetUserHealthBarSettingsCommand(mcMMO pluginRef) { this.pluginRef = pluginRef; } diff --git a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java index 421118ec2..d1be9c454 100644 --- a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.commands; import com.gmail.nossr50.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.player.UserManager; import com.google.common.collect.ImmutableList; import org.bukkit.command.Command; @@ -12,6 +13,13 @@ import java.util.ArrayList; import java.util.List; public abstract class ToggleCommand implements TabExecutor { + + protected mcMMO pluginRef; + + public ToggleCommand(mcMMO pluginRef) { + this.pluginRef = pluginRef; + } + @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { switch (args.length) { @@ -45,9 +53,10 @@ public abstract class ToggleCommand implements TabExecutor { return true; } - if (pluginRef.getCommandTools().isOffline(sender, mcMMOPlayer.getPlayer())) { + //TODO: Does it matter if they are offline? + /*if (pluginRef.getCommandTools().isOffline(sender, mcMMOPlayer.getPlayer())) { return true; - } + }*/ applyCommandAction(mcMMOPlayer); sendSuccessMessage(sender, playerName); diff --git a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java index a44a03151..1bb5ddce0 100644 --- a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java @@ -18,9 +18,9 @@ import java.util.List; public abstract class ChatCommand implements TabExecutor { private ChatMode chatMode; - public mcMMO pluginRef; + protected mcMMO pluginRef; - public ChatCommand(ChatMode chatMode, mcMMO pluginRef) { + ChatCommand(ChatMode chatMode, mcMMO pluginRef) { this.chatMode = chatMode; this.pluginRef = pluginRef; } diff --git a/src/main/java/com/gmail/nossr50/commands/chat/ChatSpyCommand.java b/src/main/java/com/gmail/nossr50/commands/chat/ChatSpyCommand.java index 326eaf63a..c6db79d73 100644 --- a/src/main/java/com/gmail/nossr50/commands/chat/ChatSpyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/chat/ChatSpyCommand.java @@ -8,10 +8,8 @@ import org.bukkit.command.CommandSender; public class ChatSpyCommand extends ToggleCommand { - private mcMMO pluginRef; - public ChatSpyCommand(mcMMO pluginRef) { - this.pluginRef = pluginRef; + super(pluginRef); } @Override diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java index b2c06a479..a3c6cce95 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java @@ -40,7 +40,7 @@ public abstract class SkillCommand implements TabExecutor { this.pluginRef = pluginRef; this.skill = skill; skillName = skill.getName(); - skillGuideCommand = new SkillGuideCommand(skill); + skillGuideCommand = new SkillGuideCommand(skill, pluginRef); } public static String[] addItemToFirstPositionOfArray(String itemToAdd, String... existingArray) { diff --git a/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java b/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java index 222009198..8120175a9 100644 --- a/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java +++ b/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java @@ -388,7 +388,7 @@ public final class CommandRegistrationManager { command.setPermission("mcmmo.commands.mhd"); command.setPermissionMessage(permissionsMessage); command.setUsage(pluginRef.getLocaleManager().getString("Commands.Usage.0", "mhd")); - command.setExecutor(new MHDCommand()); + command.setExecutor(new ResetUserHealthBarSettingsCommand()); } private void registerMcscoreboardCommand() {