mirror of
https://github.com/BentoBoxWorld/BSkyBlock.git
synced 2024-11-13 10:24:05 +01:00
Merge remote-tracking branch 'origin/admintrash' into develop
This commit is contained in:
commit
c3c6e72384
@ -42,6 +42,7 @@ public class BSkyBlock extends GameModeAddon {
|
||||
logError("BSkyBlock settings could not load! Addon disabled.");
|
||||
setState(State.DISABLED);
|
||||
}
|
||||
new Config<>(this, Settings.class).saveConfigObject(settings);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -53,10 +54,6 @@ public class BSkyBlock extends GameModeAddon {
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
// Save settings
|
||||
if (settings != null) {
|
||||
new Config<>(this, Settings.class).saveConfigObject(settings);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -4,6 +4,7 @@ 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;
|
||||
@ -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.AdminSetrankCommand;
|
||||
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.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;
|
||||
@ -31,8 +34,8 @@ public class AdminCommand extends CompositeCommand {
|
||||
|
||||
public AdminCommand(BSkyBlock addon) {
|
||||
super(addon,
|
||||
addon.getSettings().getAdminCommand().split(" ")[0],
|
||||
addon.getSettings().getAdminCommand().split(" "));
|
||||
addon.getSettings().getAdminCommand().split(" ")[0],
|
||||
addon.getSettings().getAdminCommand().split(" "));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -75,6 +78,10 @@ public class AdminCommand extends CompositeCommand {
|
||||
new AdminSetspawnCommand(this);
|
||||
// Reset flags
|
||||
new AdminResetFlagsCommand(this);
|
||||
// Trash
|
||||
new AdminTrashCommand(this);
|
||||
new AdminEmptyTrashCommand(this);
|
||||
new AdminSwitchtoCommand(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Loading…
Reference in New Issue
Block a user