From 648a2a4a5eafe766a38c366c9c294ef7a3d58e70 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sat, 25 May 2019 20:08:08 -0700
Subject: [PATCH] Adds Admin switch command for bypassing protections.

---
 .../java/world/bentobox/bskyblock/commands/AdminCommand.java   | 3 +++
 src/main/resources/addon.yml                                   | 3 +++
 .../world/bentobox/bskyblock/commands/AdminCommandTest.java    | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
index 7e2de0c..165b9ba 100644
--- a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
+++ b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
@@ -12,6 +12,7 @@ import world.bentobox.bentobox.api.commands.admin.AdminReloadCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminResetFlagsCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminSetspawnCommand;
+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;
@@ -81,6 +82,8 @@ public class AdminCommand extends CompositeCommand {
         new AdminTrashCommand(this);
         new AdminEmptyTrashCommand(this);
         new AdminSwitchtoCommand(this);
+        // Switch
+        new AdminSwitchCommand(this);
     }
 
     @Override
diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
index bd4f8e3..721a358 100755
--- a/src/main/resources/addon.yml
+++ b/src/main/resources/addon.yml
@@ -80,6 +80,9 @@ permissions:
   bskyblock.mod.bypassexpel:
     description: Allow moderator to bypass island expulsion
     default: op
+  bskyblock.mod.switch:
+    description: Allows moderator to switch bypass protection on and off
+    default: op
   bskyblock.mod.lock:
     description: Locks or unlocks an island
     default: op
diff --git a/src/test/java/world/bentobox/bskyblock/commands/AdminCommandTest.java b/src/test/java/world/bentobox/bskyblock/commands/AdminCommandTest.java
index 1c8e6e2..36b021b 100644
--- a/src/test/java/world/bentobox/bskyblock/commands/AdminCommandTest.java
+++ b/src/test/java/world/bentobox/bskyblock/commands/AdminCommandTest.java
@@ -38,6 +38,7 @@ import world.bentobox.bskyblock.Settings;
 @PrepareForTest({Bukkit.class, BentoBox.class, User.class })
 public class AdminCommandTest {
 
+    private static final int NUM_COMMANDS = 27;
     private User user;
     private BSkyBlock addon;
 
@@ -96,7 +97,7 @@ public class AdminCommandTest {
         assertEquals("commands.admin.help.parameters", cmd.getParameters());
         assertEquals("commands.admin.help.description", cmd.getDescription());
         // Number of commands = sub commands + help
-        assertEquals("Number of sub commands registered", 26, cmd.getSubCommands().values().size());
+        assertEquals("Number of sub commands registered", NUM_COMMANDS, cmd.getSubCommands().values().size());
     }
 
     /**