Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-06-26 06:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Change order in onDisable (DisableListener, exemption, hooks).

Browse Source 
The idea is to change internals towards having a 'default'
DisableListener executing onDisable before the data removal of checks
and DataManager have been called, thus plugins or even checks might
still access all sorts data with disabling the plugin.
This commit is contained in:
asofold 2016-06-19 11:43:17 +02:00
parent 931c02714a
commit d4acad924a
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NCPCore/src/main/java/fr/neatmonster/nocheatplus/components/registry/feature/DisableListener.java
View File

@ -16,12 +16,17 @@ package fr.neatmonster.nocheatplus.components.registry.feature;
/**
* Component to listen to plugin/onDisable.
* @author mc_dev
*
* @author asofold
*
*/
public interface DisableListener {
/**
* Called in the plugin in onDisable, before unregistration of all components.
*/
public void onDisable();
/**
* Called in the plugin in onDisable, before all components get
* unregistered. This is meant for general data cleanup, there may be extra
* registry cleanup stages for data sources and checks later on.
*/
public void onDisable();
}

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

@ -629,8 +629,26 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
allComponents.remove(obj);
}
/* (non-Javadoc)
* @see org.bukkit.plugin.java.JavaPlugin#onDisable()
/**
* (Called on the plugin getting disabled.)
* <hr>
* Rough order of disabling:<br>
* <ul>
* <li>Prevent further registration. For now also disable listeners, though
* this might get shifted still.</li>
* <li><b>Call onDisable for DisableListener instances.</b> This includes
* clearing all data (Needs extensions for sorting by priority for
* DisableListener instances.).</li>
* <li>Random sequence of cleanup calls for other registries and logging
* statistics.</li>
* <li>Call removeComponent for all registered components.</li>
* <li>Cleanup BlockProperties and clear most internal mappings for
* components (needs a more clean registry approach).</li>
* <li>(Command changes cleanup: currently disabled due to compatibility
* issues, could cause other issues with dynamic plugin managers.)</li>
* <li>Cleanup ConfigManager.</li>
* <li>Shutdown LogManager.</li>
* </ul>
*/
@Override
public void onDisable() {
@ -680,20 +698,11 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
}
sched.cancelTasks(this);
// Remove hooks.
allViolationsHook.unregister();
NCPHookManager.removeAllHooks();
// Exemptions cleanup.
if (verbose) {
logManager.info(Streams.INIT, "Reset ExemptionManager...");
}
NCPExemptionManager.clear();
// Data cleanup.
// DisableListener.onDisable (includes DataManager cleanup.)
if (verbose) {
logManager.info(Streams.INIT, "onDisable calls (include DataManager cleanup)...");
}
// TODO: Sorting order + sort now (checks and data cleanup late, data manager last, allow plugins to access stuff before data is reset).
for (final DisableListener dl : disableListeners) {
try {
dl.onDisable();
@ -703,6 +712,16 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
}
}
// ExemptionManager cleanup.
if (verbose) {
logManager.info(Streams.INIT, "Reset ExemptionManager...");
}
NCPExemptionManager.clear();
// Remove hooks.
allViolationsHook.unregister();
NCPHookManager.removeAllHooks();
// Write some debug/statistics.
final Counters counters = getGenericInstance(Counters.class);
if (counters != null) {