From 02232fde3b329f8ad0d0dbc821b3b403138ca653 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 27 Jan 2019 19:12:53 -0800 Subject: [PATCH] Match BSkyBlock admin and user commands --- .../bentobox/acidisland/commands/AcidCommand.java | 4 ++++ .../world/bentobox/acidisland/commands/AiCommand.java | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/world/bentobox/acidisland/commands/AcidCommand.java b/src/main/java/world/bentobox/acidisland/commands/AcidCommand.java index 8b22777..b33be76 100644 --- a/src/main/java/world/bentobox/acidisland/commands/AcidCommand.java +++ b/src/main/java/world/bentobox/acidisland/commands/AcidCommand.java @@ -10,6 +10,7 @@ import world.bentobox.bentobox.api.commands.admin.AdminInfoCommand; import world.bentobox.bentobox.api.commands.admin.AdminRegisterCommand; import world.bentobox.bentobox.api.commands.admin.AdminReloadCommand; import world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand; +import world.bentobox.bentobox.api.commands.admin.AdminSetspawnCommand; import world.bentobox.bentobox.api.commands.admin.AdminTeleportCommand; import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand; import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand; @@ -57,6 +58,7 @@ public class AcidCommand extends CompositeCommand { new AdminRangeCommand(this); // Resets new AdminResetsResetCommand(this); + // TODO new AdminClearresetsallCommand(this); // Delete new AdminDeleteCommand(this); // Why @@ -65,6 +67,8 @@ public class AcidCommand extends CompositeCommand { new AdminDeathsCommand(this); // Reload new AdminReloadCommand(this); + // Spawn + new AdminSetspawnCommand(this); } @Override diff --git a/src/main/java/world/bentobox/acidisland/commands/AiCommand.java b/src/main/java/world/bentobox/acidisland/commands/AiCommand.java index 085276f..22e8124 100644 --- a/src/main/java/world/bentobox/acidisland/commands/AiCommand.java +++ b/src/main/java/world/bentobox/acidisland/commands/AiCommand.java @@ -16,12 +16,9 @@ import world.bentobox.bentobox.api.commands.island.IslandResetnameCommand; import world.bentobox.bentobox.api.commands.island.IslandSethomeCommand; import world.bentobox.bentobox.api.commands.island.IslandSetnameCommand; import world.bentobox.bentobox.api.commands.island.IslandSettingsCommand; +import world.bentobox.bentobox.api.commands.island.IslandSpawnCommand; import world.bentobox.bentobox.api.commands.island.IslandUnbanCommand; import world.bentobox.bentobox.api.commands.island.team.IslandTeamCommand; -import world.bentobox.bentobox.api.commands.island.team.IslandTeamCoopCommand; -import world.bentobox.bentobox.api.commands.island.team.IslandTeamTrustCommand; -import world.bentobox.bentobox.api.commands.island.team.IslandTeamUncoopCommand; -import world.bentobox.bentobox.api.commands.island.team.IslandTeamUntrustCommand; import world.bentobox.bentobox.api.user.User; public class AiCommand extends CompositeCommand { @@ -44,6 +41,7 @@ public class AiCommand extends CompositeCommand { new IslandInfoCommand(this); new IslandCreateCommand(this); new IslandGoCommand(this); + new IslandSpawnCommand(this); new IslandResetCommand(this); new IslandSetnameCommand(this); new IslandResetnameCommand(this); @@ -55,10 +53,6 @@ public class AiCommand extends CompositeCommand { new IslandBanlistCommand(this); // Team commands new IslandTeamCommand(this); - new IslandTeamTrustCommand(this); - new IslandTeamUntrustCommand(this); - new IslandTeamCoopCommand(this); - new IslandTeamUncoopCommand(this); } /* (non-Javadoc)