Upstream
/
CompatNoCheatPlus
mirror of https://github.com/asofold/CompatNoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make unregistration of NCPHook instances more robust. 

* Do catch exceptions on unregister (too many for now).
* Register a DisableListener with NCP, for timely unregistration.
* Still attempt to unregister in onDisable (no effect for the usual
case)
This commit is contained in:
asofold 2014-07-21 12:01:57 +02:00
parent c410ebb9da
commit a649ad5c18
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
CompatNoCheatPlus/src/me/asofold/bpl/cncp/CompatNoCheatPlus.java
View File

@ -6,6 +6,7 @@ import java.util.LinkedHashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import me.asofold.bpl.cncp.config.Settings; import me.asofold.bpl.cncp.config.Settings;
@ -28,7 +29,6 @@ import org.bukkit.command.CommandSender;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginDescriptionFile;
@ -36,6 +36,8 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitScheduler;
import fr.neatmonster.nocheatplus.NCPAPIProvider;
import fr.neatmonster.nocheatplus.components.DisableListener;
import fr.neatmonster.nocheatplus.hooks.NCPHook; import fr.neatmonster.nocheatplus.hooks.NCPHook;
import fr.neatmonster.nocheatplus.hooks.NCPHookManager; import fr.neatmonster.nocheatplus.hooks.NCPHookManager;
@ -326,24 +328,34 @@ public class CompatNoCheatPlus extends JavaPlugin implements Listener {
@Override @Override
public void onDisable() { public void onDisable() {
unregisterNCPHooks(); // Just in case.
enabled = false; enabled = false;
// remove all registered cncp hooks:
unregisterNCPHooks();
registeredHooks.clear();
instance = null; // Set last. instance = null; // Set last.
super.onDisable(); super.onDisable();
} }
private int unregisterNCPHooks() { protected int unregisterNCPHooks() {
// TODO: Clear list here !? Currently done externally...
int n = 0; int n = 0;
for (Hook hook : registeredHooks){ for (Hook hook : registeredHooks) {
NCPHook ncpHook = hook.getNCPHook(); String hookDescr = null;
if (ncpHook != null){ try {
NCPHookManager.removeHook(ncpHook); NCPHook ncpHook = hook.getNCPHook();
n ++; if (ncpHook != null){
hookDescr = ncpHook.getHookName() + ": " + ncpHook.getHookVersion();
NCPHookManager.removeHook(ncpHook);
n ++;
}
} catch (Throwable e)
{
if (hookDescr != null) {
// Some error with removing a hook.
getLogger().log(Level.WARNING, "Failed to unregister hook: " + hookDescr, e);
}
} }
} }
getLogger().info("[cncp] Removed "+n+" registered hooks from NoCheatPlus."); getLogger().info("[cncp] Removed "+n+" registered hooks from NoCheatPlus.");
registeredHooks.clear();
return n; return n;
} }
@ -363,19 +375,23 @@ public class CompatNoCheatPlus extends JavaPlugin implements Listener {
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
void onPluginEnable(PluginEnableEvent event){ void onPluginEnable(PluginEnableEvent event){
Plugin plugin = event.getPlugin(); Plugin plugin = event.getPlugin();
if (!plugin.getName().equals("NoCheatPlus")) return; if (!plugin.getName().equals("NoCheatPlus")) {
if (registeredHooks.isEmpty()) return; return;
}
// Register to rmeove hooks when NCP is disabling.
NCPAPIProvider.getNoCheatPlusAPI().addComponent(new DisableListener(){
@Override
public void onDisable() {
// Remove all registered cncp hooks:
unregisterNCPHooks();
}
});
if (registeredHooks.isEmpty()) {
return;
}
registerHooks(); registerHooks();
} }
@EventHandler(priority = EventPriority.NORMAL)
void onPluginDisable(PluginDisableEvent event){
Plugin plugin = event.getPlugin();
if (!plugin.getName().equals("NoCheatPlus")) return;
if (registeredHooks.isEmpty()) return;
unregisterNCPHooks();
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.bukkit.plugin.java.JavaPlugin#onCommand(org.bukkit.command.CommandSender, org.bukkit.command.Command, java.lang.String, java.lang.String[]) * @see org.bukkit.plugin.java.JavaPlugin#onCommand(org.bukkit.command.CommandSender, org.bukkit.command.Command, java.lang.String, java.lang.String[])
*/ */