Upstream/BSkyBlock
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BSkyBlock.git synced 2024-11-14 10:25:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/admintrash' into develop

Browse Source
This commit is contained in:
tastybento 2019-02-19 22:30:54 -08:00
commit c3c6e72384
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/world/bentobox/bskyblock/BSkyBlock.java
View File

@ -42,6 +42,7 @@ public class BSkyBlock extends GameModeAddon {
logError("BSkyBlock settings could not load! Addon disabled."); logError("BSkyBlock settings could not load! Addon disabled.");
setState(State.DISABLED); setState(State.DISABLED);
} }
new Config<>(this, Settings.class).saveConfigObject(settings);
} }
@Override @Override
@ -53,10 +54,6 @@ public class BSkyBlock extends GameModeAddon {
@Override @Override
public void onDisable() { public void onDisable() {
// Save settings
if (settings != null) {
new Config<>(this, Settings.class).saveConfigObject(settings);
}
} }
@Override @Override

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

@ -4,6 +4,7 @@ import java.util.List;
import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.commands.admin.AdminDeleteCommand; 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.AdminGetrankCommand;
import world.bentobox.bentobox.api.commands.admin.AdminInfoCommand; import world.bentobox.bentobox.api.commands.admin.AdminInfoCommand;
import world.bentobox.bentobox.api.commands.admin.AdminRegisterCommand; import world.bentobox.bentobox.api.commands.admin.AdminRegisterCommand;
@ -11,7 +12,9 @@ import world.bentobox.bentobox.api.commands.admin.AdminReloadCommand;
import world.bentobox.bentobox.api.commands.admin.AdminResetFlagsCommand; import world.bentobox.bentobox.api.commands.admin.AdminResetFlagsCommand;
import world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand; import world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand;
import world.bentobox.bentobox.api.commands.admin.AdminSetspawnCommand; import world.bentobox.bentobox.api.commands.admin.AdminSetspawnCommand;
import world.bentobox.bentobox.api.commands.admin.AdminSwitchtoCommand;
import world.bentobox.bentobox.api.commands.admin.AdminTeleportCommand; 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.AdminUnregisterCommand;
import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand; import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand;
import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand; import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand;
@ -31,8 +34,8 @@ public class AdminCommand extends CompositeCommand {
public AdminCommand(BSkyBlock addon) { public AdminCommand(BSkyBlock addon) {
super(addon, super(addon,
addon.getSettings().getAdminCommand().split(" ")[0], addon.getSettings().getAdminCommand().split(" ")[0],
addon.getSettings().getAdminCommand().split(" ")); addon.getSettings().getAdminCommand().split(" "));
} }
@Override @Override
@ -75,6 +78,10 @@ public class AdminCommand extends CompositeCommand {
new AdminSetspawnCommand(this); new AdminSetspawnCommand(this);
// Reset flags // Reset flags
new AdminResetFlagsCommand(this); new AdminResetFlagsCommand(this);
// Trash
new AdminTrashCommand(this);
new AdminEmptyTrashCommand(this);
new AdminSwitchtoCommand(this);
} }
@Override @Override