No need to call super.onLoad.

This commit is contained in:
asofold 2014-05-31 16:26:54 +02:00
parent d610d46a97
commit b669d65b92

View File

@ -655,8 +655,12 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
changedCommands.addAll(PermissionUtil.protectCommands(Permissions.FILTER_COMMAND, noCommand, true, false, noCommandMsg)); changedCommands.addAll(PermissionUtil.protectCommands(Permissions.FILTER_COMMAND, noCommand, true, false, noCommandMsg));
} }
// Add to changes history for undoing. // Add to changes history for undoing.
if (this.changedCommands == null) this.changedCommands = changedCommands; if (this.changedCommands == null) {
else this.changedCommands.addAll(changedCommands); this.changedCommands = changedCommands;
}
else {
this.changedCommands.addAll(changedCommands);
}
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -665,8 +669,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
@Override @Override
public void onLoad() { public void onLoad() {
NCPAPIProvider.setNoCheatPlusAPI(this); NCPAPIProvider.setNoCheatPlusAPI(this);
// TODO: Can not set to null in onDisable...
super.onLoad(); // TODO: Check what this does / order.
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -888,7 +890,9 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
initBlockProperties(config); initBlockProperties(config);
// Reset Command protection. // Reset Command protection.
undoCommandChanges(); undoCommandChanges();
if (config.getBoolean(ConfPaths.PROTECT_PLUGINS_HIDE_ACTIVE)) setupCommandProtection(); if (config.getBoolean(ConfPaths.PROTECT_PLUGINS_HIDE_ACTIVE)) {
setupCommandProtection();
}
// (Re-) schedule consistency checking. // (Re-) schedule consistency checking.
scheduleConsistencyCheckers(); scheduleConsistencyCheckers();
// Cache some things. // Cache some things.