From d0ddc7c2713df5b610b956f1fe42a33aea4b1aef Mon Sep 17 00:00:00 2001
From: Redecouverte <michael.heerklotz@web.de>
Date: Tue, 22 Feb 2011 02:03:20 +0100
Subject: [PATCH] - added .gitignore to ignore eclipse/etc build files - events
 are now registered in onEnable()

---
 .gitignore                                    | 13 +++++++++
 .../worldguard/bukkit/WorldGuardPlugin.java   | 29 +++++++++++--------
 2 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..2a85539e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+/bin
+/build
+/dist
+/release
+/store
+/test
+/lib/Bukkit.jar
+/lib/Craftbukkit.jar
+/lib/truezip.jar
+/lib/WorldEdit.jar
+.classpath
+.project
+manifest.mf
\ No newline at end of file
diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
index 7d2452f1..cd2ec6cc 100644
--- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
+++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
@@ -77,9 +77,9 @@ public class WorldGuardPlugin extends JavaPlugin {
         new WorldGuardBlockListener(this);
     private final WorldGuardEntityListener entityListener =
         new WorldGuardEntityListener(this);
-    private final PermissionsResolverServerListener permsListener;
-    
-    private final PermissionsResolverManager perms;
+
+    private PermissionsResolverServerListener permsListener;
+    private PermissionsResolverManager perms;
     
     Blacklist blacklist;
 
@@ -148,19 +148,27 @@ public class WorldGuardPlugin extends JavaPlugin {
      */
     public WorldGuardPlugin(PluginLoader pluginLoader, Server instance,
             PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) {
-        super(pluginLoader, instance, desc, folder, plugin, cLoader);
-
+      
         logger.info("WorldGuard " + desc.getVersion() + " loaded.");
-        
+    }
+
+    /**
+     * Called on plugin enable.
+     */
+    public void onEnable() {
+        PluginDescriptionFile desc = this.getDescription();
+        File folder = this.getDataFolder();
+
         folder.mkdirs();
 
         createDefaultConfiguration("config.yml");
         createDefaultConfiguration("blacklist.txt");
-        
+
         regionLoader = new CSVDatabase(new File(folder, "regions.txt"));
         perms = new PermissionsResolverManager(getConfiguration(), getServer(),
                 "WorldGuard", logger);
         permsListener = new PermissionsResolverServerListener(perms);
+        
         loadConfiguration();
         postReload();
         registerEvents();
@@ -173,18 +181,15 @@ public WorldGuardPlugin(PluginLoader pluginLoader, Server instance,
                 Logger.getLogger("Minecraft").setFilter(null);
             }
         }
-    }
 
-    /**
-     * Called on plugin enable.
-     */
-    public void onEnable() {
+        logger.info("WorldGuard " + desc.getVersion() + " enabled.");
     }
 
     /**
      * Called on plugin disable.
      */
     public void onDisable() {
+        logger.info("WorldGuard " + this.getDescription().getVersion() + " disabled.");
     }
 
     /**