From f338325bd9a8b382ba36ecfc803a0040a94c7779 Mon Sep 17 00:00:00 2001 From: Evenprime Date: Sun, 20 Feb 2011 14:05:22 +0100 Subject: [PATCH] Minor changes to logging --- .../evenprime/bukkit/nocheat/MovingCheck.java | 1 + .../bukkit/nocheat/NoCheatPlugin.java | 59 +++++++++---------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/cc/co/evenprime/bukkit/nocheat/MovingCheck.java b/src/cc/co/evenprime/bukkit/nocheat/MovingCheck.java index 6854b7ed..a53c3b4e 100644 --- a/src/cc/co/evenprime/bukkit/nocheat/MovingCheck.java +++ b/src/cc/co/evenprime/bukkit/nocheat/MovingCheck.java @@ -332,6 +332,7 @@ public class MovingCheck { event.getPlayer().teleportTo(data.movingSetBackPoint); } else { + // Lets try it that way. Maybe now people don't "disappear" any longer event.setFrom(event.getFrom()); event.setTo(event.getFrom().clone()); event.getPlayer().teleportTo(event.getFrom()); diff --git a/src/cc/co/evenprime/bukkit/nocheat/NoCheatPlugin.java b/src/cc/co/evenprime/bukkit/nocheat/NoCheatPlugin.java index b1529227..631db67b 100644 --- a/src/cc/co/evenprime/bukkit/nocheat/NoCheatPlugin.java +++ b/src/cc/co/evenprime/bukkit/nocheat/NoCheatPlugin.java @@ -3,11 +3,9 @@ package cc.co.evenprime.bukkit.nocheat; import java.io.File; import java.util.logging.Logger; -import org.bukkit.Server; import org.bukkit.event.Event.Priority; import org.bukkit.event.Event; import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.PluginLoader; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.PluginManager; @@ -30,50 +28,49 @@ public class NoCheatPlugin extends JavaPlugin { public static Logger log; public static PermissionHandler Permissions = null; - - public NoCheatPlugin(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) { - super(pluginLoader, instance, desc, folder, plugin, cLoader); - playerListener = new NoCheatPluginPlayerListener(this); - vehicleListener = new NoCheatPluginVehicleListener(this, playerListener); - - log = NoCheatConfiguration.logger; - } + public NoCheatPlugin() { + + playerListener = new NoCheatPluginPlayerListener(this); + vehicleListener = new NoCheatPluginVehicleListener(this, playerListener); + + log = NoCheatConfiguration.logger; + } public void onDisable() { } public void onEnable() { - - PluginManager pm = getServer().getPluginManager(); - pm.registerEvent(Event.Type.PLAYER_MOVE, playerListener, Priority.Lowest, this); - pm.registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Monitor, this); - pm.registerEvent(Event.Type.VEHICLE_EXIT, vehicleListener, Priority.Monitor, this); - pm.registerEvent(Event.Type.VEHICLE_DAMAGE, vehicleListener, Priority.Monitor, this); - - PluginDescriptionFile pdfFile = this.getDescription(); - Logger.getLogger("Minecraft").info( "NoCheat version " + pdfFile.getVersion() + " is enabled!" ); - - setupPermissions(); - setupConfig(); + + PluginManager pm = getServer().getPluginManager(); + pm.registerEvent(Event.Type.PLAYER_MOVE, playerListener, Priority.Lowest, this); + pm.registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Monitor, this); + pm.registerEvent(Event.Type.VEHICLE_EXIT, vehicleListener, Priority.Monitor, this); + pm.registerEvent(Event.Type.VEHICLE_DAMAGE, vehicleListener, Priority.Monitor, this); + + PluginDescriptionFile pdfFile = this.getDescription(); + Logger.getLogger("Minecraft").info( "NoCheat version " + pdfFile.getVersion() + " is enabled!" ); + + setupPermissions(); + setupConfig(); } - + public void setupPermissions() { Plugin test = this.getServer().getPluginManager().getPlugin("Permissions"); if(Permissions == null) { - if(test != null) { - Permissions = ((Permissions)test).getHandler(); - } else { - log.info("Nocheat couldn't find Permissions plugin. Fallback to OP -> all allowed."); - this.getServer().getPluginManager().disablePlugin(this); - } + if(test != null) { + Permissions = ((Permissions)test).getHandler(); + } else { + log.info("Nocheat couldn't find Permissions plugin. Fallback to OP -> all allowed."); + this.getServer().getPluginManager().disablePlugin(this); + } } } - + public void setupConfig() { NoCheatConfiguration.config(new File("plugins/NoCheat/nocheat.yml")); - + } } \ No newline at end of file