Upstream
/
BSkyBlock
mirror of https://github.com/BentoBoxWorld/BSkyBlock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/BentoBoxWorld/BSkyBlock.git into develop

This commit is contained in:
tastybento 2020-04-04 12:19:11 -07:00
parent 6e7d92a3d5 e3f3b2effe
commit 9f702b187f
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
View File

@ -4,7 +4,6 @@ import java.util.List;
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;
@ -13,10 +12,7 @@ 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.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,11 +77,11 @@ public class AdminCommand 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);
//new AdminSwitchCommand(this);
// Purge
new AdminPurgeCommand(this);
// Settings

2
src/test/java/world/bentobox/bskyblock/commands/AdminCommandTest.java
View File

@ -40,7 +40,7 @@ import world.bentobox.bskyblock.Settings;
@PrepareForTest({Bukkit.class, BentoBox.class, User.class })
public class AdminCommandTest {
private static final int NUM_COMMANDS = 29;
private static final int NUM_COMMANDS = 25;
@Mock
private User user;
@Mock