From 5b3344498da57a434b48df8c64d79082f98feab5 Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 6 Apr 2020 17:00:00 -0700 Subject: [PATCH] Removed commands for island trash because they should not be needed. --- .../world/bentobox/acidisland/commands/AcidCommand.java | 9 +++------ .../bentobox/acidisland/commands/AcidCommandTest.java | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/world/bentobox/acidisland/commands/AcidCommand.java b/src/main/java/world/bentobox/acidisland/commands/AcidCommand.java index ba1facd..1055b78 100644 --- a/src/main/java/world/bentobox/acidisland/commands/AcidCommand.java +++ b/src/main/java/world/bentobox/acidisland/commands/AcidCommand.java @@ -5,7 +5,6 @@ import java.util.List; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.admin.AdminDeleteCommand; -import world.bentobox.bentobox.api.commands.admin.AdminEmptyTrashCommand; import world.bentobox.bentobox.api.commands.admin.AdminGetrankCommand; import world.bentobox.bentobox.api.commands.admin.AdminInfoCommand; import world.bentobox.bentobox.api.commands.admin.AdminRegisterCommand; @@ -15,9 +14,7 @@ import world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand; import world.bentobox.bentobox.api.commands.admin.AdminSetspawnCommand; import world.bentobox.bentobox.api.commands.admin.AdminSettingsCommand; import world.bentobox.bentobox.api.commands.admin.AdminSwitchCommand; -import world.bentobox.bentobox.api.commands.admin.AdminSwitchtoCommand; import world.bentobox.bentobox.api.commands.admin.AdminTeleportCommand; -import world.bentobox.bentobox.api.commands.admin.AdminTrashCommand; import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand; import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand; import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand; @@ -81,9 +78,9 @@ public class AcidCommand extends CompositeCommand { // Reset flags new AdminResetFlagsCommand(this); // Trash - new AdminTrashCommand(this); - new AdminEmptyTrashCommand(this); - new AdminSwitchtoCommand(this); + //new AdminTrashCommand(this); + //new AdminEmptyTrashCommand(this); + //new AdminSwitchtoCommand(this); // Switch new AdminSwitchCommand(this); // Purge diff --git a/src/test/java/world/bentobox/acidisland/commands/AcidCommandTest.java b/src/test/java/world/bentobox/acidisland/commands/AcidCommandTest.java index 5da0e86..a988c34 100644 --- a/src/test/java/world/bentobox/acidisland/commands/AcidCommandTest.java +++ b/src/test/java/world/bentobox/acidisland/commands/AcidCommandTest.java @@ -36,7 +36,7 @@ import world.bentobox.bentobox.managers.FlagsManager; @PrepareForTest({Bukkit.class, BentoBox.class, User.class }) public class AcidCommandTest { - private static final int NUM_COMMANDS = 29; + private static final int NUM_COMMANDS = 26; @Mock private User user; @Mock