Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-01-30 03:11:22 +01:00
Code Issues Projects Releases Wiki Activity

Add a PostEnableTask to avoid confusion with timings.

Browse Source
This commit is contained in:
asofold 2015-01-13 01:19:56 +01:00
parent d2da3f1e9e
commit d23c09d355
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java
View File

@ -196,6 +196,23 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
} }
}; };
private class PostEnableTask implements Runnable {
private final NoCheatPlusCommand commandHandler;
private final Player[] onlinePlayers;
protected PostEnableTask(NoCheatPlusCommand commandHandler, Player[] onlinePlayers) {
this.commandHandler = commandHandler;
this.onlinePlayers = onlinePlayers;
}
@Override
public void run() {
postEnable(commandHandler, onlinePlayers);
}
}
/** Access point for thread safe message queuing. */ /** Access point for thread safe message queuing. */
private final PlayerMessageSender playerMessageSender = new PlayerMessageSender(); private final PlayerMessageSender playerMessageSender = new PlayerMessageSender();
@ -886,28 +903,7 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
// TODO: re-map ExemptionManager ! // TODO: re-map ExemptionManager !
// TODO: Disable all checks for these players for one tick ? // TODO: Disable all checks for these players for one tick ?
// TODO: Prepare check data for players [problem: permissions]? // TODO: Prepare check data for players [problem: permissions]?
Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() { Bukkit.getScheduler().scheduleSyncDelayedTask(this, new PostEnableTask(commandHandler, onlinePlayers));
@Override
public void run() {
postEnable(onlinePlayers,
new Runnable() {
@Override
public void run() {
// Set child permissions for commands for faster checking.
PermissionUtil.addChildPermission(commandHandler.getAllSubCommandPermissions(), Permissions.FILTER_COMMAND_NOCHEATPLUS, PermissionDefault.OP);
}
},
new Runnable() {
@Override
public void run() {
if (ConfigManager.getConfigFile().getBoolean(ConfPaths.PROTECT_PLUGINS_HIDE_ACTIVE)) {
setupCommandProtection();
}
}
}
);
}
});
// Set StaticLog to more efficient output. // Set StaticLog to more efficient output.
StaticLog.setStreamID(Streams.STATUS); StaticLog.setStreamID(Streams.STATUS);
@ -918,16 +914,23 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
/** /**
* Actions to be done after enable of all plugins. This aims at reloading mainly. * Actions to be done after enable of all plugins. This aims at reloading mainly.
*/ */
private void postEnable(final Player[] onlinePlayers, Runnable... runnables){ protected void postEnable(final NoCheatPlusCommand commandHandler, final Player[] onlinePlayers){
logManager.info(Streams.INIT, "[NoCheatPlus] Post-enable running..."); logManager.info(Streams.INIT, "[NoCheatPlus] Post-enable running...");
for (final Runnable runnable : runnables){ try {
try{ // Set child permissions for commands for faster checking.
runnable.run(); PermissionUtil.addChildPermission(commandHandler.getAllSubCommandPermissions(), Permissions.FILTER_COMMAND_NOCHEATPLUS, PermissionDefault.OP);
} } catch (Throwable t) {
catch(Throwable t){ logManager.severe(Streams.INIT, "[NoCheatPlus] Failed to complement permissions: " + t.getClass().getSimpleName());
logManager.severe(Streams.INIT, "[NoCheatPlus] Encountered a problem during post-enable: " + t.getClass().getSimpleName()); logManager.severe(Streams.INIT, t);
logManager.severe(Streams.INIT, t); }
try {
// Command protection feature.
if (ConfigManager.getConfigFile().getBoolean(ConfPaths.PROTECT_PLUGINS_HIDE_ACTIVE)) {
setupCommandProtection();
} }
} catch (Throwable t) {
logManager.severe(Streams.INIT, "[NoCheatPlus] Failed to apply command protection: " + t.getClass().getSimpleName());
logManager.severe(Streams.INIT, t);
} }
for (final Player player : onlinePlayers){ for (final Player player : onlinePlayers){
updatePermStateReceivers(player); updatePermStateReceivers(player);