Fixed configuration file not being reloaded.

CHANGELOG.txt

@@ -1,3 +1,103 @@
+2.1:
+- Improved Bukkit support.
+
+2.0beta3:
+- Fixed NullPointerException inside the ignite hook.
+
+2.0beta2:
+- Fixed a NullPointerException in the damage hook.
+
+2.0beta1:
+- Added area protection. Use /region or /rg to define regions.
+
+1.8.1
+- Fixed NullPointerException.
+
+1.8
+- Updated for Minecraft beta.
+- Blacklist hooks have CHANGED. The new hooks are work better. on-create has
+    been replaced with on-place (for block placement) and on-use
+    (for item usage, light buckets and lighters). The old on-use is now
+    on-right-click although it currently does nothing.
+- Added coordinates to blacklist file logger.
+- Added suffocation damage prevention.
+
+1.7.1
+- Updated for v0.2.8.
+
+1.7
+- Updated for v0.2.6_02 and hMod b129.
+- Added option to prevent water from damaging particular blocks
+    (Redstone wire, Minecart tracks, etc.). See disable-water-damage-blocks.
+- /reload WorldGuard should now reload WorldGuard's configuration.
+- Added wg-invincible and wg-amphibious groups that let you give certain
+    players invincibility or underwater breathing.
+- Added the ability to disable fall, water, lava, and/or fire damage.
+- Water/lava bucket blocking should now be more reliable.
+- Added /stack (alias /;) commands to stack items in your inventory into
+    piles up to 64 items in size. Even unstackable items like signs can be
+    stacked.
+- /god mode should now let you gain health.
+- /god mode should now work more reliably.
+- Caught an error message for when the configuration file does not exist.
+
+1.6
+- Added spawn protection that prevents damage when a player spawns.
+- Added login protection that prevents damage when a player joins.
+- Added /god. /god can be used on others, provided that the /godother
+    permission is set for the command's user.
+
+1.5.1
+- Removed the 'java.lang.NoSuchMethodError: Item.setDamage(I)V' error
+    generated.
+
+1.5
+- Removed the block lag fix.
+- WorldGuard now conditionally loads features so you can use any up-to-date
+    build of hMod and the unsupported features won't break the entire
+    plugin. When WG loads, check the server console for a report of
+    features that are not supported by your version of hMod.
+- Changed some configuration defaults:
+    disable-lava-fire=true
+    simulate-sponge=true
+    item-durability=false
+
+1.4.1
+- Fixed issue with the block lag fix dropping item stacks of 0 quantity.
+
+1.4
+- New on-acquire hook. This does both a total inventory check on inventory
+    change and item pick up denial. The item pick up denial is largely
+    thanks to Dinnerbone for fulfilling my request to add a particular hook.
+- Item durability can now be toggled with item-durability. Thanks to
+    Dinnerbone for figuring this out while filfilling my request. The
+    default setting is to fix item durability.
+- New no-physics-gravel and no-physics-sand options allow you to
+    prevent gravel and sand from falling.
+- New allow-portal-anywhere option allows you to create portal blocks
+    anywhere.
+    
+1.3
+- UPGRADE WARNING: If you are using database logging, you must add a
+    NULL 'comment' VARCHAR field to the table. The line of SQL that you
+    can run for MySQL can be found in blacklist_table.sql.
+- Improved plugin compatibility with the block lag fix. For maximum
+    compatibility, you must now list WorldGuard as the first plugin in
+    server.properties and you cannot reload or enable the plugin
+    while the server is up. This is for bad plugins that unnecessarily
+    use the "critical" priority for its hooks like the LWC. Most plugins
+    don't do that though, so this won't apply for most people.
+- Fixed signs being blank if they were denied via the blacklist.
+- Added on-break event to the blacklist.
+- Added comments and messages. Comments are only for your own use and they
+    are printed with the log and notify actions of the blacklist. The
+    message replaces the message that is shown the user and it is optional.
+- The blacklist notification messages are now more compact and are
+    light grey instead of light purple.
+- The notify, log, and tell actions will now trigger every time for the
+    on-break, on-create, on-drop events rather than wait 3 seconds between
+    events for the same item or block for a player.
+
 1.2
 - /stopfire and /allowfire disable and enable fire spreading globally.
 - Block lag fix slightly improved in accuracy for item drops.

INSTALL.txt

@@ -1,7 +1,20 @@
 Installation
 ------------
 
-This plugin requires Hey0's server modification.
+Bukkit:
+
+** Make sure you first install the WorldEdit plugin. **
+
+  1. Create a "plugins" folder inside your server folder.
+
+  2. Copy WorldGuard.jar into "plugins".
+  
+  3. Restart your server.
+
+You may want to copy config.yml into plugins/WorldGuard/config.yml
+(you will have to create that folder). Edit it to fit your needs.
+
+hMod:
 
   1. Create a "plugins" folder inside your "bin" folder.
 

README.txt

@@ -13,17 +13,20 @@ use or not:
 - Block TNT explosions.
 - Block lighters from setting fires.
 - Block all fires.
+- Disable fall damage, lava damage, fire damage, and/or water damage.
 - Allow fire but prevent it from burning certain blocks.
 - Prevent lava from starting fires.
 - Restrict lava spreading to only some block types.
 - Simulate classic-esque water by letting water infinitely expand in
     area (only if there is a block underneath).
+- Prevent water from destroying blocks like Redstone wire and flowers.
 - Simulate the function of the sponge from Minecraft Classic.
 - Notify admins, block, log, kick or ban for the use of certain block types
     or items.
 - Temporarily stop fire globally with some commands.
-- Fix the block lag.
 - Destroy tools on drop to alleviate the durability cheat.
+- Prevent gravel and sand from falling.
+- Allow portal blocks to be placed anywhere.
 
 hMod is required as WorldGuard is a plugin for hMod.
 
@@ -34,6 +37,18 @@ A "worldguard.properties" will be created the first the time that you load
 WorldGuard on your server. You can either restart your server or use
 /reloadplugin WorldGuard to reload the configuraton file after editing it.
 
+NOTE: Some features may require a custom version of hMod. When the server
+is loaded with the plugin, WorldGuard will tell you the features
+unsupported by your version of hMod.
+
+- summary-on-start (def. true)
+    Print a summary of WorldGuard's protection settings at-a-glance when
+    the plugin is loaded.
+
+- item-durability (def. false)
+    **Requires special version of hMod
+    Enables item durability.
+
 - classic-water (def. false)
     Toggle use of classic water. Be foreward that your world may be
     flooded if you are not careful. If you have WorldEdit, you can use
@@ -42,7 +57,7 @@ WorldGuard on your server. You can either restart your server or use
     ground, but if there are air blocks underneath, the water will not
     spread (preventing waterfalls from becoming tsunamis).
 
-- simulate-sponge (def. false)
+- simulate-sponge (def. true)
     Toggle simulation of the sponge from Classic. It blocks water from
     flowing near the sponge.
 
@@ -51,6 +66,18 @@ WorldGuard on your server. You can either restart your server or use
     creating a 5x5x5 cuboid free of water. Increasing the number will
     increase server load exponentially, although 3-5 has fairly low impact.
 
+- no-physics-gravel (def. false)
+    **Requires special version of hMod
+    Prevents gravel from falling due to gravity.
+
+- no-physics-sand (def. false)
+    **Requires special version of hMod
+    Prevents sand from falling due to gravity.
+
+- allow-portal-anywhere (def. false)
+    **Requires special version of hMod
+    Allows you to place portal blocks anywhere.
+
 - enforce-single-session (def. true)
     Enforce single sessions. If the player is already found to be on
     the server when s/he logs in, the other player will be kicked with
@@ -67,9 +94,10 @@ WorldGuard on your server. You can either restart your server or use
     command; it is only used for permissions.
 
 - block-creepers (def. false)
-    Block creeper explosions. They will not explode client-side.
+    Block creeper explosions from destroying terrain (and possibly from
+    causing damage).
 
-- disable-lava-fire (def. false)
+- disable-lava-fire (def. true)
     Prevent lava from starting fires.
 
 - allowed-lava-spread-blocks (no default)
@@ -84,6 +112,10 @@ WorldGuard on your server. You can either restart your server or use
     to disable this feature. Enabling disable-all-fire-spread will
     override this function.
 
+- disable-water-damage-blocks (no default)
+    List of blocks that should not be destroyed by water (Redstone wire,
+    minecart tracks, flowers, etc.).
+
 - item-drop-blacklist (no default)
     List of block names/IDs to destroy on drop. This can alleviate the
     durability cheat that allows you to drop your tools to fix their
@@ -91,9 +123,23 @@ WorldGuard on your server. You can either restart your server or use
     this is an easier way to do it (this way also prints a more
     friendly message than if you used the 'tell' action of the blacklist).
 
-- block-lag-fix (def. false)
-    Attempts to fix block lag.
+- login-protection (def. 3)
+    Number of seconds to keep a player invincible when the player joins.
 
+- spawn-protection (def. 0)
+    Number of seconds to keep a player invincible when the player spawns.
+    This does not apply to players joining the server.
+
+- kick-on-death (def. false)
+    Kick players when they die (and respawn). This is to work around the
+    issues of invisible players when players die.
+    
+- disable-fall-damage (def. false)
+- disable-lava-damage (def. false)
+- disable-fire-damage (def. false)
+- disable-water-damage (def. false)
+    Disable various types of damage.
+    
 - log-console (def. true)
     For blacklist log actions, print to console.
 
@@ -157,6 +203,12 @@ Commands
     WorldGuard. Note that disabling fire does not disable fire damage
     but fire at least won't spread.
 
+- /god
+    Toggles your invincibility. Players must have permission to use "/god"
+    to be able to use this command. You can also use this command to
+    toggle the invincibility of others although you must have the
+    "/godother" permission.
+
 Server Commands
 ---------------
 
@@ -174,3 +226,26 @@ certain rules apply to only some groups.
 
 Edit the included worldguard-blacklist.txt file and follow the
 instructions inside. The file comes with the download for WorldGuard.
+
+Other Features
+--------------
+
+To give someone invincibility every time s/he joins the server, create
+a wg-invincible group and add the group to the user or have the user's
+group inherit this group.
+
+To give someone the ability to breathe under water, create
+a wg-amphibious group and add the group to the user or have the user's
+group inherit this group.
+
+Thanks
+------
+
+While I would like to thank everyone for their support, I would like to
+say thanks to the following individuals for their direct
+contributions to WorldGuard:
+
+- Sturmeh, for contributing the original durability workaround
+- Meaglin, for changing the on flow hook at my request
+- Dinnerbone, for implementing the on item pick up hook at my request,
+    and also for figuring out the durability bug in the process

blacklist_table.sql

@@ -12,5 +12,10 @@ CREATE TABLE `blacklist_events` (
   `z` int(11) NOT NULL,
   `item` int(11) NOT NULL,
   `time` int(11) NOT NULL,
+  `comment` varchar(255) NULL,
   PRIMARY KEY (`id`)
 );
+
+-- Required update if you have an older version of the table:
+
+ALTER TABLE `blacklist_events` ADD `comment` VARCHAR( 255 ) NULL 

build.xml

@@ -0,0 +1,92 @@
+<project name="WorldGuard" default="dist" basedir=".">
+  <description>WorldGuard fixes bugs with Minecraft SMP and provides for
+    protection.</description>
+  
+  <property name="src.dir" location="src"/>
+  <property name="build.dir" location="build"/>
+  <property name="dist.dir" location="dist"/>
+  <property name="release.dir" location="release"/>
+  <property name="lib.dir" location="lib"/>
+
+  <target name="init">
+    <mkdir dir="${build.dir}"/>
+  </target>
+
+  <!-- Compile the source files -->
+  <target name="compile" depends="init">
+    <javac srcdir="${src.dir}" deprecation="true" includeantruntime="true" destdir="${build.dir}" debug="true">
+      <classpath>
+        <fileset dir="${lib.dir}">
+          <include name="*.jar"/>
+        </fileset>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- Build the .jar -->
+  <target name="jar" depends="compile">
+    <mkdir dir="${dist.dir}"/>
+    <manifest file="manifest.mf" mode="replace">
+      <attribute name="Implementation-Title" value="WorldGuard"/>
+      <attribute name="Implementation-Version" value="${version}"/>
+      <attribute name="WorldGuard-Version" value="${version}"/>
+      <attribute name="Class-Path" value="WorldEdit.jar"/>
+    </manifest>
+    <copy tofile="${build.dir}/plugin.yml" file="plugin.yml"/>
+    <jar jarfile="${dist.dir}/WorldGuard.jar" basedir="${build.dir}" manifest="manifest.mf"/>
+  </target>
+
+  <!-- Create the .jar -->
+  <target name="dist">
+    <property name="version" value="nightly"/>
+    <antcall target="jar"/>
+  </target>
+
+  <!-- Build a release -->
+  <target name="release">
+    <input message="Enter version:" addproperty="version"/>
+    <antcall target="jar"/>
+    <delete dir="${release.dir}"/>
+    <mkdir dir="${release.dir}"/>
+    <copy todir="${release.dir}">
+      <fileset dir="."/>
+      <globmapper from="*.txt" to="*.txt"/>
+    </copy>
+    <copy tofile="${release.dir}/worldguard.updatr" file="worldguard.updatr"/>
+    <replace file="${release.dir}/worldguard.updatr" token="%version%" value="${version}"/>
+    <copy tofile="${release.dir}/plugin.yml" file="plugin.yml"/>
+    <copy tofile="${release.dir}/config.yml" file="config.yml"/>
+    <replace file="${release.dir}/plugin.yml" token="WGVERSIONMACRO" value="${version}"/>
+    <copy file="worldguard.properties" todir="${release.dir}"/>
+    <copy tofile="${release.dir}/WorldGuard.jar" file="${dist.dir}/WorldGuard.jar"/>
+    <zip destfile="${release.dir}/worldguard-${version}.zip" basedir="${release.dir}" excludes="*.zip plugin.yml"/>
+    <mkdir dir="${release.dir}/src"/>
+    <copy todir="${release.dir}/src">
+      <fileset dir="${src.dir}"/>
+    </copy>
+    <zip destfile="${release.dir}/worldguard-${version}-src.zip" basedir="${release.dir}" excludes="*.zip plugin.yml"/>
+  </target>
+
+  <!-- Clean the output -->
+  <target name="clean">
+    <delete dir="${build.dir}"/>
+    <delete dir="${dist.dir}"/>
+    <delete dir="${release.dir}"/>
+  </target>
+  
+  <!--<target name="-get-version-git" if="git-revision">
+    <sequential>
+      <exec executable="git" failifexecutionfails="false" outputproperty="git-revision">
+        <arg value="rev-parse"/>
+        <arg value="HEAD"/>
+      </exec>
+      <exec executable="git" outputproperty="git-revision-dirty">
+        <arg value="diff"/>
+        <arg value="- -shortstat"/>
+      </exec>
+      <condition else="dev-${git-revision}-modified" property="version" value="dev-${git-revision}">
+        <equals arg1="" arg2="${git-revision-dirty}"/>
+      </condition>
+    </sequential>
+  </target>-->
+</project>

config.yml

@@ -0,0 +1,63 @@
+summary-on-start: true
+protection:
+    enforce-single-session: true
+    item-durability: true
+simulation:
+    classic-water: false
+    sponge:
+        enable: true
+        radius: 3
+physics:
+    # Doesn't work in Bukkit yet
+    no-physics-gravel: false
+    no-physics-sand: false
+    allow-portal-anywhere: false
+    disable-water-damage-blocks: []
+ignition:
+    block-tnt: false
+    block-lighter: false
+fire:
+    disable-all-fire-spread: false
+    disable-fire-spread-blocks: []
+    disable-lava-fire-spread: true
+    lava-spread-blocks: []
+mobs:
+    # Doesn't work in Bukkit yet
+    block-creeper-explosions: false
+spawn:
+    # Doesn't work in Bukkit yet
+    login-protection: 3
+    spawn-protection: 0
+    kick-on-death: false
+    exact-respawn: false
+    teleport-to-home-on-death: false
+player-damage:
+    # Doesn't work in Bukkit yet
+    disable-fall-damage: true
+    disable-lava-damage: true
+    disable-fire-damage: true
+    disable-drowning-damage: true
+    disable-suffocation-damage: true
+    teleport-on-suffocation: true
+regions:
+    enable: true
+    wand: 287
+blacklist:
+    logging:
+        console:
+            enable: true
+        database:
+            enable: false
+            dsn: jdbc:mysql://localhost:3306/minecraft
+            user: root
+            password: pass
+            table: blacklist_events
+        file:
+            enable: true
+            path: worldguard/logs/%Y-%m-%d.log
+            open-files: 10
+permissions:
+    groups:
+        default:
+            permissions:
+    users:

manifest.mf

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-WorldGuard-Version: 1.2

plugin.yml

@@ -0,0 +1,3 @@
+name: WorldGuard
+main: com.sk89q.worldguard.bukkit.WorldGuardPlugin
+version: WGVERSIONMACRO

src/BlacklistEntry.java

@@ -1,495 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- *
- * @author sk89q
- */
-public class BlacklistEntry {
-    /**
-     * Used to prevent spamming.
-     */
-    private static Map<String,BlacklistTrackedEvent> lastAffected =
-            new HashMap<String,BlacklistTrackedEvent>();
-    /**
-     * Parent blacklist entry.
-     */
-    private Blacklist blacklist;
-    /**
-     * List of groups to not affect.
-     */
-    private Set<String> ignoreGroups;
-    /**
-     * List of actions to perform on destruction.
-     */
-    private String[] destroyActions;
-    /**
-     * List of actions to perform on left click.
-     */
-    private String[] destroyWithActions;
-    /**
-     * List of actions to perform on right click.
-     */
-    private String[] createActions;
-    /**
-     * List of actions to perform on right click upon.
-     */
-    private String[] useActions;
-    /**
-     * List of actions to perform on drop.
-     */
-    private String[] dropActions;
-
-    /**
-     * Construct the object.
-     * 
-     * @param blacklist
-     */
-    public BlacklistEntry(Blacklist blacklist) {
-        this.blacklist = blacklist;
-    }
-
-    /**
-     * @return the ignoreGroups
-     */
-    public String[] getIgnoreGroups() {
-        return ignoreGroups.toArray(new String[ignoreGroups.size()]);
-    }
-
-    /**
-     * @param ignoreGroups the ignoreGroups to set
-     */
-    public void setIgnoreGroups(String[] ignoreGroups) {
-        Set<String> ignoreGroupsSet = new HashSet<String>();
-        for (String group : ignoreGroups) {
-            ignoreGroupsSet.add(group.toLowerCase());
-        }
-        this.ignoreGroups = ignoreGroupsSet;
-    }
-
-    /**
-     * @return
-     */
-    public String[] getDestroyActions() {
-        return destroyActions;
-    }
-
-    /**
-     * @param actions
-     */
-    public void setDestroyActions(String[] actions) {
-        this.destroyActions = actions;
-    }
-
-    /**
-     * @return
-     */
-    public String[] getDestroyWithActions() {
-        return destroyWithActions;
-    }
-
-    /**
-     * @param action
-     */
-    public void setDestroyWithActions(String[] actions) {
-        this.destroyWithActions = actions;
-    }
-
-    /**
-     * @return the rightClickActions
-     */
-    public String[] getCreateActions() {
-        return createActions;
-    }
-
-    /**
-     * @param actions
-     */
-    public void setCreateActions(String[] actions) {
-        this.createActions = actions;
-    }
-
-    /**
-     * @return
-     */
-    public String[] getUseActions() {
-        return useActions;
-    }
-
-    /**
-     * @param actions
-     */
-    public void setUseActions(String[] actions) {
-        this.useActions = actions;
-    }
-
-    /**
-     * @return
-     */
-    public String[] getDropActions() {
-        return dropActions;
-    }
-
-    /**
-     * @param actions
-     */
-    public void setDropActions(String[] actions) {
-        this.dropActions = actions;
-    }
-
-    /**
-     * Returns true if this player should be ignored.
-     *
-     * @param player
-     * @return
-     */
-    public boolean shouldIgnore(Player player) {
-        if (ignoreGroups == null) {
-            return false;
-        }
-        for (String group : player.getGroups()) {
-            if (ignoreGroups.contains(group.toLowerCase())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Announces a message to all administrators.
-     * 
-     * @param str
-     */
-    public void notifyAdmins(String str) {
-        for (Player player : etc.getServer().getPlayerList()) {
-            if (player.canUseCommand("/wprotectalerts")
-                    || player.canUseCommand("/worldguardnotify")) {
-                player.sendMessage(Colors.LightPurple + "WorldGuard: " + str);
-            }
-        }
-    }
-
-    /**
-     * Ban a player.
-     * 
-     * @param player
-     * @param msg
-     */
-    public void banPlayer(Player player, String msg) {
-        etc.getServer().ban(player.getName());
-        etc.getLoader().callHook(PluginLoader.Hook.BAN, new Object[]{
-            player.getUser(), player.getUser(), msg
-        });
-        player.kick(msg);
-    }
-
-    /**
-     * Called on block destruction. Returns true to let the action pass
-     * through.
-     *
-     * @param block
-     * @param player
-     * @return
-     */
-    public boolean onDestroy(final Block block, final Player player) {
-        if (destroyActions == null) {
-            return true;
-        }
-
-        final BlacklistEntry entry = this;
-
-        ActionHandler handler = new ActionHandler() {
-            public void log(String itemName) {
-                blacklist.getLogger().logDestroyAttempt(player, block);
-            }
-            public void kick(String itemName) {
-                player.kick("You are not allowed to destroy " + itemName);
-            }
-            public void ban(String itemName) {
-                entry.banPlayer(player, "Banned: You are not allowed to destroy " + itemName);
-            }
-            public void notifyAdmins(String itemName) {
-                entry.notifyAdmins(player.getName() + " tried to destroy " + itemName + ".");
-            }
-            public void tell(String itemName) {
-                player.sendMessage(Colors.Yellow + "You are not allowed to destroy " + itemName + ".");
-            }
-        };
-
-        return process(block.getType(), player, destroyActions, handler);
-    }
-
-    /**
-     * Called on left click. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onDestroyWith(final int item, final Player player) {
-        if (destroyWithActions == null) {
-            return true;
-        }
-
-        final BlacklistEntry entry = this;
-
-        ActionHandler handler = new ActionHandler() {
-            public void log(String itemName) {
-                blacklist.getLogger().logDestroyWithAttempt(player, item);
-            }
-            public void kick(String itemName) {
-                player.kick("You can't destroy with " + itemName);
-            }
-            public void ban(String itemName) {
-                entry.banPlayer(player, "Banned: You can't destroy with " + itemName);
-            }
-            public void notifyAdmins(String itemName) {
-                entry.notifyAdmins(player.getName() + " tried to destroyed with " + itemName + ".");
-            }
-            public void tell(String itemName) {
-                player.sendMessage(Colors.Yellow + "You can't destroy with " + itemName + ".");
-            }
-        };
-
-        return process(item, player, destroyWithActions, handler);
-    }
-
-    /**
-     * Called on right click. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onCreate(final int item, final Player player) {
-        if (createActions == null) {
-            return true;
-        }
-
-        final BlacklistEntry entry = this;
-
-        ActionHandler handler = new ActionHandler() {
-            public void log(String itemName) {
-                blacklist.getLogger().logCreateAttempt(player, item);
-            }
-            public void kick(String itemName) {
-                player.kick("You can't create " + itemName);
-            }
-            public void ban(String itemName) {
-                entry.banPlayer(player, "Banned: You can't create " + itemName);
-            }
-            public void notifyAdmins(String itemName) {
-                entry.notifyAdmins(player.getName() + " tried to create " + itemName + ".");
-            }
-            public void tell(String itemName) {
-                player.sendMessage(Colors.Yellow + "You can't create " + itemName + ".");
-            }
-        };
-
-        return process(item, player, createActions, handler);
-    }
-
-    /**
-     * Called on right click upon. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onUse(final Block block, final Player player) {
-        if (useActions == null) {
-            return true;
-        }
-
-        final BlacklistEntry entry = this;
-
-        ActionHandler handler = new ActionHandler() {
-            public void log(String itemName) {
-                blacklist.getLogger().logUseAttempt(player, block);
-            }
-            public void kick(String itemName) {
-                player.kick("You can't use " + itemName);
-            }
-            public void ban(String itemName) {
-                entry.banPlayer(player, "Banned: You can't use " + itemName);
-            }
-            public void notifyAdmins(String itemName) {
-                entry.notifyAdmins(player.getName() + " tried to use " + itemName + ".");
-            }
-            public void tell(String itemName) {
-                player.sendMessage(Colors.Yellow + "You're not allowed to use " + itemName + ".");
-            }
-        };
-
-        return process(block.getType(), player, useActions, handler);
-    }
-
-    /**
-     * Called on right click upon. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onSilentUse(final Block block, final Player player) {
-        if (useActions == null) {
-            return true;
-        }
-
-        ActionHandler handler = new ActionHandler() {
-            public void log(String itemName) {
-            }
-            public void kick(String itemName) {
-            }
-            public void ban(String itemName) {
-            }
-            public void notifyAdmins(String itemName) {
-            }
-            public void tell(String itemName) {
-            }
-        };
-
-        return process(block.getType(), player, useActions, handler);
-    }
-
-    /**
-     * Called on item drop. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onDrop(final int item, final Player player) {
-        if (dropActions == null) {
-            return true;
-        }
-
-        final BlacklistEntry entry = this;
-
-        ActionHandler handler = new ActionHandler() {
-            public void log(String itemName) {
-                blacklist.getLogger().logDropAttempt(player, item);
-            }
-            public void kick(String itemName) {
-                player.kick("You can't drop " + itemName);
-            }
-            public void ban(String itemName) {
-                entry.banPlayer(player, "Banned: You can't drop " + itemName);
-            }
-            public void notifyAdmins(String itemName) {
-                entry.notifyAdmins(player.getName() + " tried to drop " + itemName + ".");
-            }
-            public void tell(String itemName) {
-                player.sendMessage(Colors.Yellow + "You're not allowed to drop " + itemName + ".");
-            }
-        };
-
-        return process(item, player, dropActions, handler);
-    }
-
-    /**
-     * Internal method to handle the actions.
-     * 
-     * @param id
-     * @param player
-     * @param actions
-     * @return
-     */
-    private boolean process(int id, Player player, String[] actions, ActionHandler handler) {
-        if (shouldIgnore(player)) {
-            return true;
-        }
-
-        String name = player.getName();
-        long now = System.currentTimeMillis();
-        boolean repeating = false;
-
-        // Check to see whether this event is being repeated
-        BlacklistTrackedEvent tracked = lastAffected.get(name);
-        if (tracked != null) {
-            if (tracked.getId() == id && tracked.getTime() > now - 3000) {
-                repeating = true;
-            } else {
-                tracked.setTime(now);
-                tracked.setId(id);
-            }
-        } else {
-            lastAffected.put(name, new BlacklistTrackedEvent(id, now));
-        }
-
-        boolean ret = true;
-        
-        for (String action : actions) {
-            if (action.equalsIgnoreCase("deny")) {
-                ret = false;
-            } else if (action.equalsIgnoreCase("kick")) {
-                handler.kick(etc.getDataSource().getItem(id));
-            } else if (action.equalsIgnoreCase("ban")) {
-                handler.ban(etc.getDataSource().getItem(id));
-            } else if (!repeating) {
-                if (action.equalsIgnoreCase("notify")) {
-                    handler.notifyAdmins(etc.getDataSource().getItem(id));
-                } else if (action.equalsIgnoreCase("log")) {
-                    handler.log(etc.getDataSource().getItem(id));
-                } else if (!repeating && action.equalsIgnoreCase("tell")) {
-                    handler.tell(etc.getDataSource().getItem(id));
-                }
-            }
-        }
-
-        return ret;
-    }
-
-    /**
-     * Forget a player.
-     *
-     * @param player
-     */
-    public static void forgetPlayer(Player player) {
-        lastAffected.remove(player.getName());
-    }
-
-    /**
-     * Forget all players.
-     *
-     * @param player
-     */
-    public static void forgetAllPlayers() {
-        lastAffected.clear();
-    }
-
-    /**
-     * Gets called for actions.
-     */
-    private static interface ActionHandler {
-        public void log(String itemName);
-        public void kick(String itemName);
-        public void ban(String itemName);
-        public void notifyAdmins(String itemName);
-        public void tell(String itemName);
-    }
-}

src/ConsoleLoggerHandler.java

@@ -1,102 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- *
- * @author sk89q
- */
-public class ConsoleLoggerHandler implements BlacklistLoggerHandler {
-    /**
-     * Logger.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
-    /**
-     * Log a block destroy attempt.
-     *
-     * @param player
-     * @param block
-     */
-    public void logDestroyAttempt(Player player, Block block) {
-        logger.log(Level.INFO, "WorldGuard: " + player.getName()
-                + " tried to destroy " + getFriendlyItemName(block.getType()));
-    }
-
-    /**
-     * Log a right click on attempt.
-     *
-     * @param player
-     * @param block
-     */
-    public void logUseAttempt(Player player, Block block) {
-        logger.log(Level.INFO, "WorldGuard: " + player.getName()
-                + " tried to use " + getFriendlyItemName(block.getType()));
-    }
-    
-    /**
-     * Log an attempt to destroy with an item.
-     *
-     * @param player
-     * @param item
-     */
-    public void logDestroyWithAttempt(Player player, int item) {
-        logger.log(Level.INFO, "WorldGuard: " + player.getName()
-                + " tried to destroy with " + getFriendlyItemName(item));
-    }
-
-    /**
-     * Log a block creation attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logCreateAttempt(Player player, int item) {
-        logger.log(Level.INFO, "WorldGuard: " + player.getName()
-                + " tried to create " + getFriendlyItemName(item));
-    }
-
-    /**
-     * Log a drop attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logDropAttempt(Player player, int item) {
-        logger.log(Level.INFO, "WorldGuard: " + player.getName()
-                + " tried to drop " + getFriendlyItemName(item));
-    }
-
-    /**
-     * Get an item's friendly name with its ID.
-     * 
-     * @param id
-     */
-    private static String getFriendlyItemName(int id) {
-        return etc.getDataSource().getItem(id) + " (#" + id + ")";
-    }
-
-    /**
-     * Close the connection.
-     */
-    public void close() {
-    }
-}

src/DatabaseLoggerHandler.java

@@ -1,186 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-
-/**
- *
- * @author sk89q
- */
-public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
-    /**
-     * Logger.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-
-    /**
-     * DSN.
-     */
-    private String dsn;
-    /**
-     * Username.
-     */
-    private String user;
-    /**
-     * Password.
-     */
-    private String pass;
-    /**
-     * Table.
-     */
-    private String table;
-    /**
-     * Database connection.
-     */
-    private Connection conn;
-
-    /**
-     * Construct the object.
-     * 
-     * @param dsn
-     * @param user
-     * @param pass
-     */
-    public DatabaseLoggerHandler(String dsn, String user, String pass, String table) {
-        this.dsn = dsn;
-        this.user = user;
-        this.pass = pass;
-        this.table = table;
-    }
-
-    /**
-     * Gets the database connection.
-     * 
-     * @return
-     * @throws SQLException
-     */
-    private Connection getConnection() throws SQLException {
-        if (conn == null || conn.isClosed()) {
-            conn = DriverManager.getConnection(dsn, user, pass);
-        }
-        return conn;
-    }
-
-    /**
-     * Log an event to the database.
-     * 
-     * @param event
-     * @param name
-     * @param x
-     * @param y
-     * @param z
-     * @param item
-     */
-    private void logEvent(String event, String name, int x, int y, int z, int item) {
-        try {
-            Connection conn = getConnection();
-            PreparedStatement stmt = conn.prepareStatement(
-                    "INSERT INTO " + table
-                  + "(event, player, x, y, z, item, time) VALUES "
-                  + "(?, ?, ?, ?, ?, ?, ?)");
-            stmt.setString(1, event);
-            stmt.setString(2, name);
-            stmt.setInt(3, x);
-            stmt.setInt(4, y);
-            stmt.setInt(5, z);
-            stmt.setInt(6, item);
-            stmt.setInt(7, (int)(System.currentTimeMillis() / 1000));
-            stmt.executeUpdate();
-        } catch (SQLException e) {
-            logger.log(Level.SEVERE, "Failed to log blacklist event to database: "
-                    + e.getMessage());
-        }
-    }
-    
-    /**
-     * Log a block destroy attempt.
-     *
-     * @param player
-     * @param block
-     */
-    public void logDestroyAttempt(Player player, Block block) {
-        logEvent("DESTROY", player.getName(),
-                block.getX(), block.getY(), block.getZ(), block.getType());
-    }
-
-    /**
-     * Log a right click on attempt.
-     *
-     * @param player
-     * @param block
-     */
-    public void logUseAttempt(Player player, Block block) {
-        logEvent("USE", player.getName(),
-                block.getX(), block.getY(), block.getZ(), block.getType());
-    }
-    
-    /**
-     * Right a left click attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logDestroyWithAttempt(Player player, int item) {
-        logEvent("DESTROY_WITH", player.getName(),
-                (int)Math.floor(player.getX()), (int)Math.floor(player.getY()),
-                (int)Math.floor(player.getZ()), item);
-    }
-
-    /**
-     * Log a right click attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logCreateAttempt(Player player, int item) {
-        logEvent("CREATE", player.getName(),
-                (int)Math.floor(player.getX()), (int)Math.floor(player.getY()),
-                (int)Math.floor(player.getZ()), item);
-    }
-
-    /**
-     * Log a drop attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logDropAttempt(Player player, int item) {
-        logEvent("DROP", player.getName(),
-                (int)Math.floor(player.getX()), (int)Math.floor(player.getY()),
-                (int)Math.floor(player.getZ()), item);
-    }
-
-    /**
-     * Close the connection.
-     */
-    public void close() {
-        try {
-            if (conn != null && !conn.isClosed()) {
-                conn.close();
-            }
-        } catch (SQLException e) {
-            
-        }
-    }
-}

src/WorldGuard.java

@@ -1,129 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.util.jar.Manifest;
-import java.util.jar.Attributes;
-import java.net.URL;
-import java.io.*;
-
-/**
- * Entry point for the plugin for hey0's mod.
- *
- * @author sk89q
- */
-public class WorldGuard extends Plugin {
-    /**
-     * Logger.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    /**
-     * Listener for the plugin system.
-     */
-    private WorldGuardListener listener;
-
-    /**
-     * Initialize the plugin.
-     */
-    public WorldGuard() {
-        listener = new WorldGuardListener(this);
-    }
-
-    /**
-     * Initializes the plugin.
-     */
-    @Override
-    public void initialize() {
-        PluginLoader loader = etc.getLoader();
-
-        loader.addListener(PluginLoader.Hook.COMMAND, listener, this,
-                PluginListener.Priority.MEDIUM);
-        loader.addListener(PluginLoader.Hook.SERVERCOMMAND, listener, this,
-                PluginListener.Priority.MEDIUM);
-        loader.addListener(PluginLoader.Hook.EXPLODE, listener, this,
-                PluginListener.Priority.HIGH);
-        loader.addListener(PluginLoader.Hook.IGNITE, listener, this,
-                PluginListener.Priority.HIGH);
-        loader.addListener(PluginLoader.Hook.FLOW, listener, this,
-                PluginListener.Priority.HIGH);
-        loader.addListener(PluginLoader.Hook.LOGINCHECK, listener, this,
-                PluginListener.Priority.HIGH);
-        loader.addListener(PluginLoader.Hook.LOGIN, listener, this,
-                PluginListener.Priority.MEDIUM);
-        loader.addListener(PluginLoader.Hook.BLOCK_CREATED, listener, this,
-                PluginListener.Priority.HIGH);
-        loader.addListener(PluginLoader.Hook.BLOCK_DESTROYED, listener, this,
-                PluginListener.Priority.HIGH);
-        loader.addListener(PluginLoader.Hook.DISCONNECT, listener, this,
-                PluginListener.Priority.HIGH);
-        loader.addListener(PluginLoader.Hook.ITEM_DROP , listener, this,
-                PluginListener.Priority.HIGH);
-        loader.addListener(PluginLoader.Hook.COMPLEX_BLOCK_CHANGE, listener, this,
-                PluginListener.Priority.HIGH);
-        loader.addListener(PluginLoader.Hook.COMPLEX_BLOCK_SEND, listener, this,
-                PluginListener.Priority.HIGH);
-    }
-
-    /**
-     * Enables the plugin.
-     */
-    @Override
-    public void enable() {
-        logger.log(Level.INFO, "WorldGuard version " + getVersion() + " loaded");
-        listener.loadConfiguration();
-
-        etc.getInstance().addCommand("/stopfire", "Globally stop fire spread");
-        etc.getInstance().addCommand("/allowfire", "Globally re-enable fire spread");
-    }
-
-    /**
-     * Disables the plugin.
-     */
-    @Override
-    public void disable() {
-        try {
-            listener.disable();
-            BlacklistEntry.forgetAllPlayers();
-        } catch (Throwable t) {
-        }
-
-        etc.getInstance().removeCommand("/stopfire");
-        etc.getInstance().removeCommand("/allowfire");
-    }
-
-    /**
-     * Get the WorldGuard version.
-     *
-     * @return
-     */
-    private String getVersion() {
-        try {
-            String classContainer = WorldGuard.class.getProtectionDomain()
-                    .getCodeSource().getLocation().toString();
-            URL manifestUrl = new URL("jar:" + classContainer + "!/META-INF/MANIFEST.MF");
-            Manifest manifest = new Manifest(manifestUrl.openStream());
-            Attributes attrib = manifest.getMainAttributes();
-            String ver = (String)attrib.getValue("WorldGuard-Version");
-            return ver != null ? ver : "(unavailable)";
-        } catch (IOException e) {
-            return "(unknown)";
-        }
-    }
-}

src/WorldGuardListener.java

@@ -1,765 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.util.logging.Handler;
-import java.util.logging.ConsoleHandler;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Random;
-import java.io.*;
-import java.util.logging.FileHandler;
-import com.sk89q.worldguard.*;
-
-/**
- * Event listener for Hey0's server mod.
- *
- * @author sk89q
- */
-public class WorldGuardListener extends PluginListener {
-    /**
-     * Logger.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    /**
-     * Timer for threading.
-     */
-    private static final Timer timer = new Timer();
-    /**
-     * Random number generator.
-     */
-    private static Random rand = new Random();
-
-    /**
-     * Plugin host.
-     */
-    private WorldGuard plugin;
-    /**
-     * Properties file for WorldGuard.
-     */
-    private PropertiesFile properties = new PropertiesFile("worldguard.properties");
-    /**
-     * List of blocks to remove when possible.
-     */
-    private LinkedList<int[]> blockRemoveQueue = new LinkedList<int[]>();
-
-    /**
-     * Stop fire spread mode.
-     */
-    private boolean stopFireSpread = false;
-    
-    private boolean enforceOneSession;
-    private boolean blockCreepers;
-    private boolean blockTNT;
-    private boolean blockLighter;
-    private boolean preventLavaFire;
-    private boolean disableAllFire;
-    private boolean simulateSponge;
-    private int spongeRadius;
-    private boolean blockLagFix;
-    private Set<Integer> fireNoSpreadBlocks;
-    private Set<Integer> allowedLavaSpreadOver;
-    private Set<Integer> itemDropBlacklist;
-    private boolean classicWater;
-    private Blacklist blacklist;
-
-    /**
-     * Construct the listener.
-     * 
-     * @param plugin
-     */
-    public WorldGuardListener(WorldGuard plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Convert a comma-delimited list to a set of integers.
-     * 
-     * @param str
-     * @return
-     */
-    private static Set<Integer> toBlockIDSet(String str) {
-        if (str.trim().length() == 0) {
-            return null;
-        }
-        
-        String[] items = str.split(",");
-        Set<Integer> result = new HashSet<Integer>();
-
-        for (String item : items) {
-            try {
-                result.add(Integer.parseInt(item.trim()));
-            } catch (NumberFormatException e) {
-                int id = etc.getDataSource().getItem(item.trim());
-                if (id != 0) {
-                    result.add(id);
-                } else {
-                    logger.log(Level.WARNING, "WorldGuard: Unknown block name: "
-                            + item);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Load the configuration
-     */
-    public void loadConfiguration() {
-        properties.load();
-
-        // Load basic options
-        enforceOneSession = properties.getBoolean("enforce-single-session", true);
-        blockCreepers = properties.getBoolean("block-creepers", false);
-        blockTNT = properties.getBoolean("block-tnt", false);
-        blockLighter = properties.getBoolean("block-lighter", false);
-        preventLavaFire = properties.getBoolean("disable-lava-fire", false);
-        disableAllFire = properties.getBoolean("disable-all-fire-spread", false);
-        itemDropBlacklist = toBlockIDSet(properties.getString("item-drop-blacklist", ""));
-        fireNoSpreadBlocks = toBlockIDSet(properties.getString("disallowed-fire-spread-blocks", ""));
-        allowedLavaSpreadOver = toBlockIDSet(properties.getString("allowed-lava-spread-blocks", ""));
-        classicWater = properties.getBoolean("classic-water", false);
-        simulateSponge = properties.getBoolean("simulate-sponge", false);
-        spongeRadius = Math.max(1, properties.getInt("sponge-radius", 3)) - 1;
-        blockLagFix = properties.getBoolean("block-lag-fix", false);
-
-        // Console log configuration
-        boolean logConsole = properties.getBoolean("log-console", true);
-
-        // Database log configuration
-        boolean logDatabase = properties.getBoolean("log-database", false);
-        String dsn = properties.getString("log-database-dsn", "jdbc:mysql://localhost:3306/minecraft");
-        String user = properties.getString("log-database-user", "root");
-        String pass = properties.getString("log-database-pass", "");
-        String table = properties.getString("log-database-table", "blacklist_events");
-
-        // File log configuration
-        boolean logFile = properties.getBoolean("log-file", false);
-        String logFilePattern = properties.getString("log-file-path", "worldguard/logs/%Y-%m-%d.log");
-        int logFileCacheSize = Math.max(1, properties.getInt("log-file-open-files", 10));
-
-        // Load the blacklist
-        try {
-            // If there was an existing blacklist, close loggers
-            if (blacklist != null) {
-                blacklist.getLogger().close();
-            }
-
-            // First load the blacklist data from worldguard-blacklist.txt
-            Blacklist blacklist = new Blacklist();
-            blacklist.load(new File("worldguard-blacklist.txt"));
-
-            // If the blacklist is empty, then set the field to null
-            // and save some resources
-            if (blacklist.isEmpty()) {
-                this.blacklist = null;
-            } else {
-                this.blacklist = blacklist;
-                logger.log(Level.INFO, "WorldGuard: Blacklist loaded.");
-
-                BlacklistLogger blacklistLogger = blacklist.getLogger();
-
-                if (logDatabase) {
-                    blacklistLogger.addHandler(new DatabaseLoggerHandler(dsn, user, pass, table));
-                }
-
-                if (logConsole) {
-                    blacklistLogger.addHandler(new ConsoleLoggerHandler());
-                }
-
-                if (logFile) {
-                    FileLoggerHandler handler =
-                            new FileLoggerHandler(logFilePattern, logFileCacheSize);
-                    blacklistLogger.addHandler(handler);
-                }
-            }
-        } catch (FileNotFoundException e) {
-            logger.log(Level.WARNING, "WorldGuard blacklist does not exist.");
-        } catch (IOException e) {
-            logger.log(Level.WARNING, "Could not load WorldGuard blacklist: "
-                    + e.getMessage());
-        }
-
-        // Print an overview of settings
-        if (properties.getBoolean("summary-on-start", true)) {
-            logger.log(Level.INFO, enforceOneSession ? "WorldGuard: Single session is enforced."
-                    : "WorldGuard: Single session is NOT ENFORCED.");
-            logger.log(Level.INFO, blockTNT ? "WorldGuard: TNT ignition is blocked."
-                    : "WorldGuard: TNT ignition is PERMITTED.");
-            logger.log(Level.INFO, blockLighter ? "WorldGuard: Lighters are blocked."
-                    : "WorldGuard: Lighters are PERMITTED.");
-            logger.log(Level.INFO, preventLavaFire ? "WorldGuard: Lava fire is blocked."
-                    : "WorldGuard: Lava fire is PERMITTED.");
-            if (disableAllFire) {
-                logger.log(Level.INFO, "WorldGuard: All fire spread is disabled.");
-            } else {
-                if (fireNoSpreadBlocks != null) {
-                    logger.log(Level.INFO, "WorldGuard: Fire spread is limited to "
-                            + fireNoSpreadBlocks.size() + " block types.");
-                } else {
-                    logger.log(Level.INFO, "WorldGuard: Fire spread is UNRESTRICTED.");
-                }
-            }
-        }
-    }
-    
-    /**
-     * Called during the early login process to check whether or not to kick the
-     * player
-     *
-     * @param user
-     * @return kick reason. null if you don't want to kick the player.
-     */
-    public String onLoginChecks(String user) {
-        if (enforceOneSession) {
-            for (Player player : etc.getServer().getPlayerList()) {
-                if (player.getName().equalsIgnoreCase(user)) {
-                    player.kick("Logged in from another location.");
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Called during the later login process
-     *
-     * @param player
-     */
-    public void onLogin(Player player) {
-        if (stopFireSpread) {
-            player.sendMessage(Colors.Yellow + "Fire spread is currently globally disabled.");
-        }
-    }
-
-    /**
-     * Called before the command is parsed. Return true if you don't want the
-     * command to be parsed.
-     *
-     * @param player
-     * @param split
-     * @return false if you want the command to be parsed.
-     */
-    public boolean onCommand(Player player, String[] split) {
-        if (split[0].equalsIgnoreCase("/stopfire") &&
-                player.canUseCommand("/stopfire")) {
-            if (!stopFireSpread) {
-                etc.getServer().messageAll(Colors.Yellow
-                        + "Fire spread has been globally disabled by " + player.getName() + ".");
-            } else {
-                player.sendMessage(Colors.Yellow + "Fire spread was already globally disabled.");
-            }
-            stopFireSpread = true;
-            return true;
-        } else if (split[0].equalsIgnoreCase("/allowfire")
-                    && player.canUseCommand("/stopfire")) {
-            if (stopFireSpread) {
-                etc.getServer().messageAll(Colors.Yellow
-                        + "Fire spread has been globally re-enabled by " + player.getName() + ".");
-            } else {
-                player.sendMessage(Colors.Yellow + "Fire spread was already globally enabled.");
-            }
-            stopFireSpread = false;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Called before the console command is parsed. Return true if you don't
-     * want the server command to be parsed by the server.
-     *
-     * @param split
-     * @return false if you want the command to be parsed.
-     */
-    public boolean onConsoleCommand(String[] split) {
-        if (split[0].equalsIgnoreCase("fire-stop")) {
-            if (!stopFireSpread) {
-                etc.getServer().messageAll(Colors.Yellow
-                        + "Fire spread has been globally disabled by server console.");
-                logger.log(Level.INFO, "Fire spread is now globally disabled.");
-            } else {
-                logger.log(Level.INFO, "Fire spread was already globally disabled.");
-            }
-            stopFireSpread = true;
-            return true;
-        } else if (split[0].equalsIgnoreCase("fire-allow")) {
-            if (stopFireSpread) {
-                etc.getServer().messageAll(Colors.Yellow
-                        + "Fire spread has been globally re-enabled by server console.");
-                logger.log(Level.INFO, "Fire spread is now globally enabled.");
-            } else {
-                logger.log(Level.INFO, "Fire spread was already globally enabled.");
-            }
-            stopFireSpread = false;
-            return true;
-        }
-
-        return false;
-    }
-    
-    /**
-     * Called when a player drops an item.
-     * 
-     * @param player
-     *            player who dropped the item
-     * @param item
-     *            item that was dropped
-     * @return true if you don't want the dropped item to be spawned in the
-     *         world
-     */
-    public boolean onItemDrop(Player player, Item item) {
-        if (itemDropBlacklist != null) {
-            int n = item.getItemId();
-            if (itemDropBlacklist.contains(n)) {
-                player.sendMessage(Colors.Rose + "Item was destroyed!");
-                return true;
-            }
-        }
-        
-        if (blacklist != null) {
-            if (!blacklist.onDrop(item.getItemId(), player)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Called when someone presses right click. If they right clicked with a
-     * block you can return true to cancel that. You can intercept this to add
-     * your own right click actions to different item types (see itemInHand)
-     *
-     * @param player
-     * @param blockPlaced
-     * @param blockClicked
-     * @param itemInHand
-     * @return false if you want the action to go through
-     */
-    public boolean onBlockCreate(Player player, Block blockPlaced, Block blockClicked,
-            int itemInHand) {
-        if (blacklist != null) {
-            if (!blacklist.onCreate(itemInHand, player)) {
-                // Water/lava bucket fix
-                if (itemInHand == 326 || itemInHand == 327) {
-                    final int x = blockPlaced.getX();
-                    final int y = blockPlaced.getY();
-                    final int z = blockPlaced.getZ();
-                    final int existingID = etc.getServer().getBlockIdAt(x, y, z);
-
-                    // This is REALLY BAD, but there's no other choice
-                    // at the moment that is as reliable
-                    timer.schedule(new TimerTask() {
-                        public void run() {
-                            try {
-                                etc.getServer().setBlockAt(existingID, x, y, z);
-                            } catch (Throwable t) {}
-                        }
-                    }, 200); // Just in case
-                }
-                return true;
-            }
-
-            if (!blacklist.onUse(blockClicked, player)) {
-                return true;
-            }
-        }
-
-        if (simulateSponge && blockPlaced.getType() == 19) {
-            int ox = blockPlaced.getX();
-            int oy = blockPlaced.getY();
-            int oz = blockPlaced.getZ();
-
-            Server server = etc.getServer();
-
-            for (int cx = -spongeRadius; cx <= spongeRadius; cx++) {
-                for (int cy = -spongeRadius; cy <= spongeRadius; cy++) {
-                    for (int cz = -spongeRadius; cz <= spongeRadius; cz++) {
-                        int id = server.getBlockIdAt(ox + cx, oy + cy, oz + cz);
-                        if (id == 8 || id == 9) {
-                            server.setBlockAt(0, ox + cx, oy + cy, oz + cz);
-                        }
-                    }
-                }
-            }
-        }
-        
-        return false;
-    }
-
-    /**
-     * Called when a person left clicks a block.
-     *
-     * @param player
-     * @param block
-     * @return
-     */
-    public boolean onBlockDestroy(Player player, Block block) {
-        int type = block.getType();
-        
-        if (blacklist != null) {
-            if (!blacklist.onDestroyWith(player.getItemInHand(), player)) {
-                return true;
-            }
-
-            if (!blacklist.onDestroy(block, player)) {
-                return true;
-            }
-        }
-
-        if (blockLagFix
-                && type != 7 // Bedrock
-                && type != 46 // TNT
-                && type != 50 // Torch
-                && type != 51 // Fire
-                && type != 59 // Crops
-                && type != 62 // Burning furnace
-                && type != 64 // Wooden door
-                && type != 69 // Lever
-                && type != 71 // Iron door
-                && type != 75 // Redstone torch
-                && type != 76 // Redstone torch
-                && type != 77 // Stone button
-                ) {
-
-            // Check other plugins first to see if this block can be
-            // destroyed. Since this causes the hook to eventually call
-            // twice, we try to nullify it below
-            if (canDestroyBlock(player, block)) {
-                if (block.getStatus() == 3) {
-                    int dropItem = type;
-                    int count = 1;
-
-                    if (type == 1) { dropItem = 4; } // Stone
-                    else if (type == 2) { dropItem = 3; } // Grass
-                    else if (type == 16) { dropItem = 263; } // Coal ore
-                    else if (type == 18) { // Leaves
-                        if (rand.nextDouble() > 0.95) {
-                            dropItem = 6;
-                        } else {
-                            dropItem = 0;
-                        }
-                    }
-                    else if (type == 20) { dropItem = 0; } // Glass
-                    else if (type == 43) { dropItem = 44; } // Double step
-                    else if (type == 47) { dropItem = 0; } // Bookshelves
-                    else if (type == 52) { dropItem = 0; } // Mob spawner
-                    else if (type == 53) { dropItem = 5; } // Wooden stairs
-                    else if (type == 55) { dropItem = 331; } // Redstone wire
-                    else if (type == 56) { dropItem = 264; } // Diamond ore
-                    else if (type == 60) { dropItem = 3; } // Soil
-                    else if (type == 63) { dropItem = 323; } // Sign post
-                    else if (type == 67) { dropItem = 4; } // Cobblestone stairs
-                    else if (type == 68) { dropItem = 323; } // Wall sign
-                    else if (type == 73) { dropItem = 331; count = 4; } // Redstone ore
-                    else if (type == 74) { dropItem = 331; count = 4; } // Glowing redstone ore
-                    else if (type == 78) { dropItem = 0; } // Snow
-                    else if (type == 79) { dropItem = 0; } // Ice
-                    else if (type == 82) { dropItem = 337; count = 4; } // Clay
-                    else if (type == 83) { dropItem = 338; } // Reed
-                    else if (type == 89) { dropItem = 348; } // Lightstone
-
-                    etc.getServer().setBlockAt(0, block.getX(), block.getY(), block.getZ());
-
-                    if (dropItem > 0) {
-                        for (int i = 0; i < count; i++) {
-                            etc.getServer().dropItem(block.getX(), block.getY(), block.getZ(),
-                                    dropItem, i);
-                        }
-
-                        // Drop flint with gravel
-                        if (type == 13) {
-                            if (rand.nextDouble() >= 0.9) {
-                                etc.getServer().dropItem(block.getX(), block.getY(), block.getZ(),
-                                        318, 1);
-                            }
-                        }
-                    }
-
-                    // Now loop this hook back through!
-                    block.setStatus(3); // Block is destroyed
-                    canDestroyBlock(player, block);
-                }
-
-                return true;
-            }
-
-            // So we don't have double hook calls caused by the
-            // plugin/protection check
-            block.setType(0);
-            block.setStatus(2);
-        }
-        
-        return false;
-    }
-
-    /**
-     * Called when either a sign, chest or furnace is changed.
-     *
-     * @param player
-     *            player who changed it
-     * @param complexBlock
-     *            complex block that changed
-     * @return true if you want any changes to be reverted
-     */
-    public boolean onComplexBlockChange(Player player, ComplexBlock complexBlock) {
-        if (blacklist != null) {
-            if (complexBlock instanceof Chest) {
-                Block block = new Block(54, complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-
-                if (!blacklist.onSilentUse(block, player)) {
-                    return true;
-                }
-            } else if (complexBlock instanceof Furnace) {
-                int id = etc.getServer().getBlockIdAt(complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-                Block block = new Block(id, complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-
-                if (!blacklist.onSilentUse(block, player)) {
-                    return true;
-                }
-            } else if (complexBlock instanceof Sign) {
-                int id = etc.getServer().getBlockIdAt(complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-                Block block = new Block(id, complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-
-                if (!blacklist.onSilentUse(block, player)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Called when either a sign, chest or furnace is sent to a player
-     *
-     * @param player
-     *            player who the block is being sent to
-     * @param complexBlock
-     *            complex block that's being sent
-     * @return true if you want the chest, furnace or sign to be empty
-     */
-    public boolean onSendComplexBlock(Player player, ComplexBlock complexBlock) {
-        if (blacklist != null) {
-            if (complexBlock instanceof Chest) {
-                Block block = new Block(54, complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-
-                if (!blacklist.onSilentUse(block, player)) {
-                    return true;
-                }
-            } else if (complexBlock instanceof Furnace) {
-                int id = etc.getServer().getBlockIdAt(complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-                Block block = new Block(id, complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-
-                if (!blacklist.onSilentUse(block, player)) {
-                    return true;
-                }
-            } else if (complexBlock instanceof Sign) {
-                int id = etc.getServer().getBlockIdAt(complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-                Block block = new Block(id, complexBlock.getX(),
-                        complexBlock.getY(), complexBlock.getZ());
-
-                if (!blacklist.onSilentUse(block, player)) {
-                    return true;
-                }
-            }
-        }
-        
-        return false;
-    }
-
-    /*
-     * Called when either a lava block or a lighter tryes to light something on fire.
-     * block status depends on the light source:
-     * 1 = lava.
-     * 2 = lighter (flint + steel).
-     * 3 = spread (dynamic spreading of fire).
-     * @param block
-     *          block that the fire wants to spawn in.
-     *
-     * @return true if you dont want the fire to ignite.
-     */
-    public boolean onIgnite(Block block, Player player) {
-        if (preventLavaFire && block.getStatus() == 1) {
-            return true;
-        }
-        
-        if (blockLighter && block.getStatus() == 2) {
-            return !player.canUseCommand("/uselighter")
-                    && !player.canUseCommand("/lighter");
-        }
-
-        if (stopFireSpread && block.getStatus() == 3) {
-            return true;
-        }
-
-        if (disableAllFire && block.getStatus() == 3) {
-            return true;
-        }
-
-        if (fireNoSpreadBlocks != null && block.getStatus() == 3) {
-            int x = block.getX();
-            int y = block.getY();
-            int z = block.getZ();
-            if (fireNoSpreadBlocks.contains(etc.getServer().getBlockIdAt(x, y - 1, z))
-                    || fireNoSpreadBlocks.contains(etc.getServer().getBlockIdAt(x + 1, y, z))
-                    || fireNoSpreadBlocks.contains(etc.getServer().getBlockIdAt(x - 1, y, z))
-                    || fireNoSpreadBlocks.contains(etc.getServer().getBlockIdAt(x, y, z - 1))
-                    || fireNoSpreadBlocks.contains(etc.getServer().getBlockIdAt(x, y, z + 1))) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * Called when a dynamite block or a creeper is triggerd.
-     * block status depends on explosive compound:
-     * 1 = dynamite.
-     * 2 = creeper.
-     * @param block
-     *          dynamite block/creeper location block.
-     *
-     * @return true if you dont the block to explode.
-     */
-    public boolean onExplode(Block block) {
-        if (blockCreepers && block.getStatus() == 2) {
-            return true;
-        }
-
-        if (blockTNT && block.getStatus() == 1) {
-            return true;
-        }
-
-        return false;
-    }
-    
-    /*
-     * Called when fluid wants to flow to a certain block.
-     * (10 & 11 for lava and 8 & 9 for water)
-     *
-     * @param blockFrom
-     *              the block where the fluid came from.
-     *              (blocktype = fluid type)
-     * @param blockTo
-     *              the block where fluid wants to flow to.
-     *
-     *
-     * @return true if you dont want the substance to flow.
-     */
-    public boolean onFlow(Block blockFrom, Block blockTo) {
-        int x = blockFrom.getX();
-        int y = blockFrom.getY();
-        int z = blockFrom.getZ();
-
-        boolean isWater = blockFrom.getType() == 8 || blockFrom.getType() == 9;
-        boolean isLava = blockFrom.getType() == 10 || blockFrom.getType() == 11;
-
-        if (simulateSponge && isWater) {
-            int ox = blockTo.getX();
-            int oy = blockTo.getY();
-            int oz = blockTo.getZ();
-
-            Server server = etc.getServer();
-
-            for (int cx = -spongeRadius; cx <= spongeRadius; cx++) {
-                for (int cy = -spongeRadius; cy <= spongeRadius; cy++) {
-                    for (int cz = -spongeRadius; cz <= spongeRadius; cz++) {
-                        if (server.getBlockIdAt(ox + cx, oy + cy, oz + cz) == 19) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (classicWater && isWater) {
-            int blockBelow = etc.getServer().getBlockIdAt(blockFrom.getX(), blockFrom.getY() - 1, blockFrom.getZ());
-            if (blockBelow != 0 && blockBelow != 8 && blockBelow != 9) {
-                etc.getServer().setBlockAt(9, blockFrom.getX(), blockFrom.getY(), blockFrom.getZ());
-                return false;
-            }
-        }
-
-        if (allowedLavaSpreadOver != null && isLava) {
-            int targetId = etc.getServer().getBlockIdAt(
-                    blockTo.getX(), blockTo.getY() - 1, blockTo.getZ());
-            if (!allowedLavaSpreadOver.contains(targetId)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Called on player disconnect
-     *
-     * @param player
-     */
-    public void onDisconnect(Player player) {
-        BlacklistEntry.forgetPlayer(player);
-    }
-
-    /**
-     * Checks if a block can be destroyed.
-     * 
-     * @param player
-     * @param block
-     * @return
-     */
-    public boolean canDestroyBlock(Player player, Block block) {
-        plugin.toggleEnabled(); // Prevent infinite loop
-        try {
-            return !(Boolean)etc.getLoader().callHook(PluginLoader.Hook.BLOCK_DESTROYED,
-                    new Object[]{ player.getUser(), block });
-        } catch (Throwable t) {
-            return true;
-        } finally {
-            plugin.toggleEnabled();
-        }
-    }
-
-    /**
-     * Call to disable the plugin.
-     */
-    public void disable() {
-        if (blacklist != null) {
-            blacklist.getLogger().close();
-        }
-    }
-}

src/au/com/bytecode/opencsv/CSVParser.java

@@ -0,0 +1,307 @@
+package au.com.bytecode.opencsv;
+
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A very simple CSV parser released under a commercial-friendly license.
+ * This just implements splitting a single line into fields.
+ * 
+ * @author Glen Smith
+ * @author Rainer Pruy
+ * 
+ */
+public class CSVParser {
+
+    private final char separator;
+
+    private final char quotechar;
+    
+    private final char escape;
+
+    private final boolean strictQuotes;
+
+    private String pending;
+    private boolean inField = false;
+
+    private final boolean ignoreLeadingWhiteSpace;
+    
+    /** The default separator to use if none is supplied to the constructor. */
+    public static final char DEFAULT_SEPARATOR = ',';
+
+    public static final int INITIAL_READ_SIZE = 128;
+
+    /**
+     * The default quote character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_QUOTE_CHARACTER = '"';
+    
+
+    /**
+     * The default escape character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_ESCAPE_CHARACTER = '\\';
+
+   /**
+    * The default strict quote behavior to use if none is supplied to the
+    * constructor
+    */
+    public static final boolean DEFAULT_STRICT_QUOTES = false;
+    
+    /**
+     * The default leading whitespace behavior to use if none is supplied to the
+     * constructor
+     */
+    public static final boolean DEFAULT_IGNORE_LEADING_WHITESPACE = true;
+    
+    /**
+     * Constructs CSVParser using a comma for the separator.
+     */
+    public CSVParser() {
+        this(DEFAULT_SEPARATOR, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVParser with supplied separator.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVParser(char separator) {
+        this(separator, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
+    }
+    
+    
+
+    /**
+     * Constructs CSVParser with supplied separator and quote char.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVParser(char separator, char quotechar) {
+        this(separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     */
+    public CSVParser(char separator, char quotechar, char escape) {
+        this(separator, quotechar, escape, DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * Allows setting the "strict quotes" flag
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param strictQuotes
+     *            if true, characters outside the quotes are ignored
+     */
+    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes) {
+        this(separator, quotechar, escape, strictQuotes, DEFAULT_IGNORE_LEADING_WHITESPACE);
+    }
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * Allows setting the "strict quotes" and "ignore leading whitespace" flags
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param strictQuotes
+     *            if true, characters outside the quotes are ignored
+     * @param ignoreLeadingWhiteSpace
+     *            if true, white space in front of a quote in a field is ignored
+     */
+    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
+        this.separator = separator;
+        this.quotechar = quotechar;
+        this.escape = escape;
+        this.strictQuotes = strictQuotes;
+        this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
+    }
+    /**
+     * 
+     * @return true if something was left over from last call(s)
+     */
+    public boolean isPending() {
+    	return pending != null;
+    }
+
+    public String[] parseLineMulti(String nextLine) throws IOException {
+    	return parseLine(nextLine, true);
+    }
+    
+    public String[]  parseLine(String nextLine) throws IOException {
+    	return parseLine(nextLine, false);
+    }
+    /**
+     * Parses an incoming String and returns an array of elements.
+     * 
+     * @param nextLine
+     *            the string to parse
+     * @param multi
+     * @return the comma-tokenized list of elements, or null if nextLine is null
+     * @throws IOException if bad things happen during the read
+     */
+    private String[] parseLine(String nextLine, boolean multi) throws IOException {
+
+    	if (!multi && pending != null) {
+    		pending = null;
+    	}
+    	
+        if (nextLine == null) {
+        	if (pending != null) {
+        		String s = pending;
+        		pending = null;
+        		return new String[] {s};
+        	} else {
+        		return null;
+        	}
+        }
+
+        List<String>tokensOnThisLine = new ArrayList<String>();
+        StringBuilder sb = new StringBuilder(INITIAL_READ_SIZE);
+        boolean inQuotes = false;
+        if (pending != null) {
+        	sb.append(pending);
+        	pending = null;
+        	inQuotes = true;
+        }
+        for (int i = 0; i < nextLine.length(); i++) {
+        	
+        	char c = nextLine.charAt(i);
+        	if (c == this.escape) {
+        		if( isNextCharacterEscapable(nextLine, inQuotes || inField, i) ){
+        			sb.append(nextLine.charAt(i+1));
+        			i++;
+        		}
+        	} else if (c == quotechar) {
+        		if( isNextCharacterEscapedQuote(nextLine, inQuotes || inField, i) ){
+        			sb.append(nextLine.charAt(i+1));
+        			i++;
+        		}else{
+        			inQuotes = !inQuotes;
+
+        			// the tricky case of an embedded quote in the middle: a,bc"d"ef,g
+                    if (!strictQuotes) {
+                        if(i>2 //not on the beginning of the line
+                                && nextLine.charAt(i-1) != this.separator //not at the beginning of an escape sequence
+                                && nextLine.length()>(i+1) &&
+                                nextLine.charAt(i+1) != this.separator //not at the	end of an escape sequence
+                        ){
+
+                            if (ignoreLeadingWhiteSpace && sb.length() > 0 && isAllWhiteSpace(sb)) {
+                                sb = new StringBuilder(INITIAL_READ_SIZE);  //discard white space leading up to quote
+                            } else {
+                                sb.append(c);
+                            }
+  
+                        }
+                    }
+        		}
+                inField = !inField;
+        	} else if (c == separator && !inQuotes) {
+        		tokensOnThisLine.add(sb.toString());
+        		sb = new StringBuilder(INITIAL_READ_SIZE); // start work on next token
+                inField = false;
+        	} else {
+                if (!strictQuotes || inQuotes){
+                    sb.append(c);
+                    inField = true;
+                }
+        	}
+        }
+        // line is done - check status
+        if (inQuotes) {
+        	if (multi) {
+        		// continuing a quoted section, re-append newline
+        		sb.append("\n");
+        		pending = sb.toString();
+        		sb = null; // this partial content is not to be added to field list yet
+        	} else {
+        		throw new IOException("Un-terminated quoted field at end of CSV line");
+        	}
+        }
+        if (sb != null) {
+        	tokensOnThisLine.add(sb.toString());
+        }
+        return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
+        
+    }
+    
+    /**  
+     * precondition: the current character is a quote or an escape
+	 * @param nextLine the current line
+	 * @param inQuotes true if the current context is quoted
+	 * @param i current index in line
+	 * @return true if the following character is a quote
+	 */
+	private boolean isNextCharacterEscapedQuote(String nextLine, boolean inQuotes, int i) {
+		return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
+		    && nextLine.length() > (i+1)  // there is indeed another character to check.
+		    && nextLine.charAt(i+1) == quotechar;
+	}
+
+	/**  
+	 * precondition: the current character is an escape
+	 * @param nextLine the current line
+	 * @param inQuotes true if the current context is quoted
+	 * @param i current index in line
+	 * @return true if the following character is a quote
+	 */
+	protected boolean isNextCharacterEscapable(String nextLine, boolean inQuotes, int i) {
+		return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
+		    && nextLine.length() > (i+1)  // there is indeed another character to check.
+		    && ( nextLine.charAt(i+1) == quotechar || nextLine.charAt(i+1) == this.escape);
+	}
+	
+	/**
+	 * precondition: sb.length() > 0
+	 * @param sb A sequence of characters to examine
+	 * @return true if every character in the sequence is whitespace
+	 */
+    protected boolean isAllWhiteSpace(CharSequence sb) {
+        boolean result = true;
+        for (int i = 0; i < sb.length(); i++) {
+            char c = sb.charAt(i);
+
+            if ( !Character.isWhitespace(c) ) {
+                return false;
+            }
+        }
+        return result;
+    }
+}

src/au/com/bytecode/opencsv/CSVReader.java

@@ -0,0 +1,282 @@
+package au.com.bytecode.opencsv;
+
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A very simple CSV reader released under a commercial-friendly license.
+ * 
+ * @author Glen Smith
+ * 
+ */
+public class CSVReader implements Closeable {
+
+    private BufferedReader br;
+
+    private boolean hasNext = true;
+
+    private CSVParser parser;
+    
+    private int skipLines;
+
+    private boolean linesSkiped;
+
+    /**
+     * The default line to start reading.
+     */
+    public static final int DEFAULT_SKIP_LINES = 0;
+
+    /**
+     * Constructs CSVReader using a comma for the separator.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     */
+    public CSVReader(Reader reader) {
+        this(reader, CSVParser.DEFAULT_SEPARATOR, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVReader(Reader reader, char separator) {
+        this(reader, separator, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVReader(Reader reader, char separator, char quotechar) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator, quote char and quote handling
+     * behavior.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, boolean strictQuotes) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, strictQuotes);
+    }
+
+   /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     */
+
+    public CSVReader(Reader reader, char separator,
+			char quotechar, char escape) {
+        this(reader, separator, quotechar, escape, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
+	}
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param line
+     *            the line number to skip for start reading 
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, int line) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, line, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line) {
+        this(reader, separator, quotechar, escape, line, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes) {
+        this(reader, separator, quotechar, escape, line, strictQuotes, CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     * @param ignoreLeadingWhiteSpace
+     *            it true, parser should ignore white space before a quote in a field
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
+        this.br = new BufferedReader(reader);
+        this.parser = new CSVParser(separator, quotechar, escape, strictQuotes, ignoreLeadingWhiteSpace);
+        this.skipLines = line;
+    }
+
+	/**
+     * Reads the entire file into a List with each element being a String[] of
+     * tokens.
+     * 
+     * @return a List of String[], with each String[] representing a line of the
+     *         file.
+     * 
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    public List<String[]> readAll() throws IOException {
+
+        List<String[]> allElements = new ArrayList<String[]>();
+        while (hasNext) {
+            String[] nextLineAsTokens = readNext();
+            if (nextLineAsTokens != null)
+                allElements.add(nextLineAsTokens);
+        }
+        return allElements;
+
+    }
+
+    /**
+     * Reads the next line from the buffer and converts to a string array.
+     * 
+     * @return a string array with each comma-separated element as a separate
+     *         entry.
+     * 
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    public String[] readNext() throws IOException {
+    	
+    	String[] result = null;
+    	do {
+    		String nextLine = getNextLine();
+    		if (!hasNext) {
+    			return result; // should throw if still pending?
+    		}
+    		String[] r = parser.parseLineMulti(nextLine);
+    		if (r.length > 0) {
+    			if (result == null) {
+    				result = r;
+    			} else {
+    				String[] t = new String[result.length+r.length];
+    				System.arraycopy(result, 0, t, 0, result.length);
+    				System.arraycopy(r, 0, t, result.length, r.length);
+    				result = t;
+    			}
+    		}
+    	} while (parser.isPending());
+    	return result;
+    }
+
+    /**
+     * Reads the next line from the file.
+     * 
+     * @return the next line from the file without trailing newline
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    private String getNextLine() throws IOException {
+    	if (!this.linesSkiped) {
+            for (int i = 0; i < skipLines; i++) {
+                br.readLine();
+            }
+            this.linesSkiped = true;
+        }
+        String nextLine = br.readLine();
+        if (nextLine == null) {
+            hasNext = false;
+        }
+        return hasNext ? nextLine : null;
+    }
+
+    /**
+     * Closes the underlying reader.
+     * 
+     * @throws IOException if the close fails
+     */
+    public void close() throws IOException{
+    	br.close();
+    }
+    
+}

src/au/com/bytecode/opencsv/CSVWriter.java

@@ -0,0 +1,302 @@
+package au.com.bytecode.opencsv;
+
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * A very simple CSV writer released under a commercial-friendly license.
+ *
+ * @author Glen Smith
+ *
+ */
+public class CSVWriter implements Closeable {
+    
+    public static final int INITIAL_STRING_SIZE = 128;
+
+	private Writer rawWriter;
+
+    private PrintWriter pw;
+
+    private char separator;
+
+    private char quotechar;
+    
+    private char escapechar;
+    
+    private String lineEnd;
+
+    /** The character used for escaping quotes. */
+    public static final char DEFAULT_ESCAPE_CHARACTER = '"';
+
+    /** The default separator to use if none is supplied to the constructor. */
+    public static final char DEFAULT_SEPARATOR = ',';
+
+    /**
+     * The default quote character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_QUOTE_CHARACTER = '"';
+    
+    /** The quote constant to use when you wish to suppress all quoting. */
+    public static final char NO_QUOTE_CHARACTER = '\u0000';
+    
+    /** The escape constant to use when you wish to suppress all escaping. */
+    public static final char NO_ESCAPE_CHARACTER = '\u0000';
+    
+    /** Default line terminator uses platform encoding. */
+    public static final String DEFAULT_LINE_END = "\n";
+
+    private ResultSetHelper resultService = new ResultSetHelperService();
+    
+    /**
+     * Constructs CSVWriter using a comma for the separator.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     */
+    public CSVWriter(Writer writer) {
+        this(writer, DEFAULT_SEPARATOR);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVWriter(Writer writer, char separator) {
+        this(writer, separator, DEFAULT_QUOTE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar) {
+    	this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escapechar
+     *            the character to use for escaping quotechars or escapechars
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar) {
+        this(writer, separator, quotechar, escapechar, DEFAULT_LINE_END);
+    }
+    
+    
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param lineEnd
+     * 			  the line feed terminator to use
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, String lineEnd) {
+        this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER, lineEnd);
+    }   
+    
+    
+    
+    /**
+     * Constructs CSVWriter with supplied separator, quote char, escape char and line ending.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escapechar
+     *            the character to use for escaping quotechars or escapechars
+     * @param lineEnd
+     * 			  the line feed terminator to use
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar, String lineEnd) {
+        this.rawWriter = writer;
+        this.pw = new PrintWriter(writer);
+        this.separator = separator;
+        this.quotechar = quotechar;
+        this.escapechar = escapechar;
+        this.lineEnd = lineEnd;
+    }
+    
+    /**
+     * Writes the entire list to a CSV file. The list is assumed to be a
+     * String[]
+     *
+     * @param allLines
+     *            a List of String[], with each String[] representing a line of
+     *            the file.
+     */
+    public void writeAll(List<String[]> allLines)  {
+    	for (String[] line : allLines) {
+			writeNext(line);
+		}
+    }
+
+    protected void writeColumnNames(ResultSet rs)
+    	throws SQLException {
+
+    	writeNext(resultService.getColumnNames(rs));
+    }
+    
+    /**
+     * Writes the entire ResultSet to a CSV file.
+     *
+     * The caller is responsible for closing the ResultSet.
+     *
+     * @param rs the recordset to write
+     * @param includeColumnNames true if you want column names in the output, false otherwise
+     *
+     * @throws java.io.IOException thrown by getColumnValue
+     * @throws java.sql.SQLException thrown by getColumnValue
+     */
+    public void writeAll(java.sql.ResultSet rs, boolean includeColumnNames)  throws SQLException, IOException {
+    	
+    	
+    	if (includeColumnNames) {
+			writeColumnNames(rs);
+		}
+    	
+    	while (rs.next())
+    	{
+    		writeNext(resultService.getColumnValues(rs));
+    	}
+    }
+
+    
+    /**
+     * Writes the next line to the file.
+     *
+     * @param nextLine
+     *            a string array with each comma-separated element as a separate
+     *            entry.
+     */
+    public void writeNext(String[] nextLine) {
+    	
+    	if (nextLine == null)
+    		return;
+    	
+        StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
+        for (int i = 0; i < nextLine.length; i++) {
+
+            if (i != 0) {
+                sb.append(separator);
+            }
+
+            String nextElement = nextLine[i];
+            if (nextElement == null)
+                continue;
+            if (quotechar !=  NO_QUOTE_CHARACTER)
+            	sb.append(quotechar);
+            
+            sb.append(stringContainsSpecialCharacters(nextElement) ? processLine(nextElement) : nextElement);
+
+            if (quotechar != NO_QUOTE_CHARACTER)
+            	sb.append(quotechar);
+        }
+        
+        sb.append(lineEnd);
+        pw.write(sb.toString());
+
+    }
+
+	private boolean stringContainsSpecialCharacters(String line) {
+	    return line.indexOf(quotechar) != -1 || line.indexOf(escapechar) != -1;
+    }
+
+	protected StringBuilder processLine(String nextElement)
+    {
+		StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
+	    for (int j = 0; j < nextElement.length(); j++) {
+	        char nextChar = nextElement.charAt(j);
+	        if (escapechar != NO_ESCAPE_CHARACTER && nextChar == quotechar) {
+	        	sb.append(escapechar).append(nextChar);
+	        } else if (escapechar != NO_ESCAPE_CHARACTER && nextChar == escapechar) {
+	        	sb.append(escapechar).append(nextChar);
+	        } else {
+	            sb.append(nextChar);
+	        }
+	    }
+	    
+	    return sb;
+    }
+
+    /**
+     * Flush underlying stream to writer.
+     * 
+     * @throws IOException if bad things happen
+     */
+    public void flush() throws IOException {
+
+        pw.flush();
+
+    } 
+
+    /**
+     * Close the underlying stream writer flushing any buffered content.
+     *
+     * @throws IOException if bad things happen
+     *
+     */
+    public void close() throws IOException {
+        flush();
+        pw.close();
+        rawWriter.close();
+    }
+
+    /**
+     *  Checks to see if the there has been an error in the printstream. 
+     */
+    public boolean checkError() {
+        return pw.checkError();
+    }
+
+    public void setResultService(ResultSetHelper resultService) {
+        this.resultService = resultService;
+    }
+
+}

src/au/com/bytecode/opencsv/ResultSetHelper.java

@@ -0,0 +1,33 @@
+package au.com.bytecode.opencsv;
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.IOException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * 
+ * 
+ * 
+ * 
+ * 
+ */
+public interface ResultSetHelper {
+    public String[] getColumnNames(ResultSet rs) throws SQLException;
+
+    public String[] getColumnValues(ResultSet rs) throws SQLException, IOException;
+}

src/au/com/bytecode/opencsv/ResultSetHelperService.java

@@ -0,0 +1,183 @@
+package au.com.bytecode.opencsv;
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+import java.io.IOException;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 
+ * 
+ *  helper class for processing JDBC ResultSet objects
+ * 
+ * 
+ */
+public class ResultSetHelperService implements ResultSetHelper {
+    public static final int CLOBBUFFERSIZE = 2048;
+    
+    // note: we want to maintain compatibility with Java 5 VM's
+    // These types don't exist in Java 5
+	private static final int NVARCHAR = -9;
+	private static final int NCHAR = -15; 
+	private static final int LONGNVARCHAR = -16;
+	private static final int NCLOB = 2011;
+
+    public String[] getColumnNames(ResultSet rs) throws SQLException {
+        List<String> names = new ArrayList<String>();
+        ResultSetMetaData metadata = rs.getMetaData();
+
+        for (int i = 0; i < metadata.getColumnCount(); i++) {
+            names.add(metadata.getColumnName(i+1));
+        }
+
+        String[] nameArray = new String[names.size()];
+        return names.toArray(nameArray);
+    }
+
+    public String[] getColumnValues(ResultSet rs) throws SQLException, IOException {
+
+        List<String> values = new ArrayList<String>();
+        ResultSetMetaData metadata = rs.getMetaData();
+
+        for (int i = 0; i < metadata.getColumnCount(); i++) {
+            values.add(getColumnValue(rs, metadata.getColumnType(i + 1), i + 1));
+        }
+
+        String[] valueArray = new String[values.size()];
+        return values.toArray(valueArray);
+    }
+
+    private String handleObject(Object obj){
+        return obj == null ? "" : String.valueOf(obj);
+    }
+
+    private String handleBigDecimal(BigDecimal decimal) {
+        return decimal == null ? "" : decimal.toString();
+    }
+
+    private String handleLong(ResultSet rs, int columnIndex) throws SQLException {
+        long lv = rs.getLong(columnIndex);
+        return rs.wasNull() ? "" : Long.toString(lv);
+    }
+
+    private String handleInteger(ResultSet rs, int columnIndex) throws SQLException {
+        int i = rs.getInt(columnIndex);
+        return rs.wasNull() ? "" : Integer.toString(i);
+    }
+
+    private String handleDate(ResultSet rs, int columnIndex) throws SQLException {
+        java.sql.Date date = rs.getDate(columnIndex);
+        String value = null;
+        if (date != null) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yyyy");
+            value =  dateFormat.format(date);
+        }
+        return value;
+    }
+
+    private String handleTime(Time time) {
+        return time == null ? null : time.toString();
+    }
+
+    private String handleTimestamp(Timestamp timestamp) {
+        SimpleDateFormat timeFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
+        return timestamp == null ? null : timeFormat.format(timestamp);
+    }
+
+    private String getColumnValue(ResultSet rs, int colType, int colIndex)
+    		throws SQLException, IOException {
+
+    	String value = "";
+
+		switch (colType)
+		{
+			case Types.BIT:
+            case Types.JAVA_OBJECT:
+				value = handleObject(rs.getObject(colIndex));
+			    break;
+			case Types.BOOLEAN:
+				boolean b = rs.getBoolean(colIndex);
+				value = Boolean.valueOf(b).toString();
+			    break;
+			case NCLOB: // todo : use rs.getNClob
+			case Types.CLOB:
+				Clob c = rs.getClob(colIndex);
+				if (c != null) {
+					value = read(c);
+				}
+			    break;
+			case Types.BIGINT:
+				value = handleLong(rs, colIndex);
+				break;
+			case Types.DECIMAL:
+			case Types.DOUBLE:
+			case Types.FLOAT:
+			case Types.REAL:
+			case Types.NUMERIC:
+				value = handleBigDecimal(rs.getBigDecimal(colIndex));
+			    break;
+			case Types.INTEGER:
+			case Types.TINYINT:
+			case Types.SMALLINT:
+                value = handleInteger(rs, colIndex);
+			    break;
+			case Types.DATE:
+				value = handleDate(rs, colIndex);
+			    break;
+			case Types.TIME:
+				value = handleTime(rs.getTime(colIndex));
+			    break;
+			case Types.TIMESTAMP:
+				value = handleTimestamp(rs.getTimestamp(colIndex));
+			    break;
+			case NVARCHAR: // todo : use rs.getNString
+			case NCHAR: // todo : use rs.getNString
+			case LONGNVARCHAR: // todo : use rs.getNString
+			case Types.LONGVARCHAR:
+			case Types.VARCHAR:
+			case Types.CHAR:
+				value = rs.getString(colIndex);
+			    break;
+			default:
+				value = "";
+		}
+
+
+		if (value == null)
+		{
+			value = "";
+		}
+
+		return value;
+
+    }
+
+    private static String read(Clob c) throws SQLException, IOException
+	{
+		StringBuilder sb = new StringBuilder( (int) c.length());
+		Reader r = c.getCharacterStream();
+		char[] cbuf = new char[CLOBBUFFERSIZE];
+		int n;
+		while ((n = r.read(cbuf, 0, cbuf.length)) != -1) {
+				sb.append(cbuf, 0, n);
+		}
+		return sb.toString();
+	}
+}

src/com/sk89q/worldguard/ConsoleLogFormat.java

@@ -1,64 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard;
-
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-import java.util.logging.Level;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-/**
- * Used for formatting.
- *
- * @author sk89q
- */
-public class ConsoleLogFormat extends Formatter {
-    public String format(LogRecord record) {
-        StringBuilder text = new StringBuilder();
-        Level level = record.getLevel();
-
-        if (level == Level.FINEST) {
-            text.append("[FINEST] ");
-        } else if (level == Level.FINER) {
-            text.append("[FINER] ");
-        } else if (level == Level.FINE) {
-            text.append("[FINE] ");
-        } else if (level == Level.INFO) {
-            text.append("[INFO] ");
-        } else if (level == Level.WARNING) {
-            text.append("[WARNING] ");
-        } else if (level == Level.SEVERE) {
-            text.append("[SEVERE] ");
-        }
-
-        text.append(record.getMessage());
-        text.append("\r\n");
-
-        Throwable t = record.getThrown();
-        if (t != null) {
-            StringWriter writer = new StringWriter();
-            t.printStackTrace(new PrintWriter(writer));
-            text.append(writer.toString());
-        }
-        
-        return text.toString();
-    }
-}

src/com/sk89q/worldguard/LocalPlayer.java

@@ -0,0 +1,89 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard;
+
+import java.util.List;
+import com.sk89q.worldedit.Vector;
+
+public abstract class LocalPlayer {
+    /**
+     * Get a player's name.
+     * 
+     * @return
+     */
+    public abstract String getName();
+    
+    /**
+     * Returns true if the player is inside a group.
+     * 
+     * @param group
+     * @return
+     */
+    public abstract boolean hasGroup(String group);
+    
+    /**
+     * Get the player's position.
+     * 
+     * @return
+     */
+    public abstract Vector getPosition();
+    
+    /**
+     * Kick the player.
+     * 
+     * @param msg
+     */
+    public abstract void kick(String msg);
+    
+    /**
+     * Ban the player.
+     * 
+     * @param msg
+     */
+    public abstract void ban(String msg);
+    
+    /**
+     * Send the player a message;
+     * 
+     * @param msg
+     */
+    public abstract void printRaw(String msg);
+    
+    /**
+     * Get the player's list of groups.
+     * 
+     * @return
+     */
+    public abstract List<String> getGroups();
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof LocalPlayer)) {
+            return false;
+        }
+        
+        return ((LocalPlayer)obj).getName().equals(getName());
+    }
+    
+    @Override
+    public int hashCode() {
+        return getName().hashCode();
+    }
+}

src/com/sk89q/worldguard/blacklist/Blacklist.java

@@ -17,6 +17,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+package com.sk89q.worldguard.blacklist;
+
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
@@ -24,12 +26,16 @@ import java.util.ArrayList;
 import java.util.logging.Logger;
 import java.util.logging.Level;
 import java.io.*;
+import org.bukkit.ChatColor;
+import com.sk89q.worldedit.blocks.ItemType;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 
 /**
  *
  * @author sk89q
  */
-public class Blacklist {
+public abstract class Blacklist {
     /**
      * Logger.
      */
@@ -44,6 +50,15 @@ public class Blacklist {
      * Logger.
      */
     private BlacklistLogger blacklistLogger = new BlacklistLogger();
+    /**
+     * Last event.
+     */
+    private BlacklistEvent lastEvent;
+    /**
+     * Used to prevent flooding.
+     */
+    Map<String,BlacklistTrackedEvent> lastAffected =
+            new HashMap<String,BlacklistTrackedEvent>();
 
     /**
      * Returns whether the list is empty.
@@ -71,126 +86,21 @@ public class Blacklist {
     }
 
     /**
-     * Called on block destruction. Returns true to let the action pass
-     * through.
-     *
-     * @param block
-     * @param player
+     * Method to handle the event.
+     * 
+     * @param event
+     * @param forceRepeat
+     * @param silent
      * @return
      */
-    public boolean onDestroy(final Block block, final Player player) {
-        List<BlacklistEntry> entries = getEntries(block.getType());
+    public boolean check(BlacklistEvent event, boolean forceRepeat, boolean silent) {
+        List<BlacklistEntry> entries = getEntries(event.getType());
         if (entries == null) {
             return true;
         }
         boolean ret = true;
         for (BlacklistEntry entry : entries) {
-            if (!entry.onDestroy(block, player)) {
-                ret = false;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Called on left click. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onDestroyWith(int item, Player player) {
-        List<BlacklistEntry> entries = getEntries(item);
-        if (entries == null) {
-            return true;
-        }
-        boolean ret = true;
-        for (BlacklistEntry entry : entries) {
-            if (!entry.onDestroyWith(item, player)) {
-                ret = false;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Called on right click. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onCreate(int item, Player player) {
-        List<BlacklistEntry> entries = getEntries(item);
-        if (entries == null) {
-            return true;
-        }
-        boolean ret = true;
-        for (BlacklistEntry entry : entries) {
-            if (!entry.onCreate(item, player)) {
-                ret = false;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Called on right click upon. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onUse(Block block, Player player) {
-        List<BlacklistEntry> entries = getEntries(block.getType());
-        if (entries == null) {
-            return true;
-        }
-        boolean ret = true;
-        for (BlacklistEntry entry : entries) {
-            if (!entry.onUse(block, player)) {
-                ret = false;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Called on right click upon. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onSilentUse(Block block, Player player) {
-        List<BlacklistEntry> entries = getEntries(block.getType());
-        if (entries == null) {
-            return true;
-        }
-        boolean ret = true;
-        for (BlacklistEntry entry : entries) {
-            if (!entry.onSilentUse(block, player)) {
-                ret = false;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Called on drop. Returns true to let the action pass through.
-     *
-     * @param item
-     * @param player
-     * @return
-     */
-    public boolean onDrop(int item, Player player) {
-        List<BlacklistEntry> entries = getEntries(item);
-        if (entries == null) {
-            return true;
-        }
-        boolean ret = true;
-        for (BlacklistEntry entry : entries) {
-            if (!entry.onDrop(item, player)) {
+            if (!entry.check(event, forceRepeat, silent)) {
                 ret = false;
             }
         }
@@ -235,7 +145,7 @@ public class Blacklist {
                         try {
                             id = Integer.parseInt(item.trim());
                         } catch (NumberFormatException e) {
-                            id = etc.getDataSource().getItem(item.trim());
+                            id = getItemID(item.trim());
                             if (id == 0) {
                                 logger.log(Level.WARNING, "WorldGuard: Unknown block name: "
                                         + item);
@@ -267,19 +177,24 @@ public class Blacklist {
                     for (BlacklistEntry entry : currentEntries) {
                         if (parts[0].equalsIgnoreCase("ignore-groups")) {
                             entry.setIgnoreGroups(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-destroy")) {
-                            entry.setDestroyActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-left")
-                                || parts[0].equalsIgnoreCase("on-destroy-with")) {
+                        } else if (parts[0].equalsIgnoreCase("on-break")) {
+                            entry.setBreakActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("on-destroy-with")) {
                             entry.setDestroyWithActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-right")
-                                || parts[0].equalsIgnoreCase("on-create")) {
-                            entry.setCreateActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-right-on")
-                                || parts[0].equalsIgnoreCase("on-use")) {
+                        } else if (parts[0].equalsIgnoreCase("on-place")) {
+                            entry.setPlaceActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("on-interact")) {
+                            entry.setInteractActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("on-use")) {
                             entry.setUseActions(parts[1].split(","));
                         } else if (parts[0].equalsIgnoreCase("on-drop")) {
                             entry.setDropActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("on-acquire")) {
+                            entry.setAcquireActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("message")) {
+                            entry.setMessage(parts[1].trim());
+                        } else if (parts[0].equalsIgnoreCase("comment")) {
+                            entry.setComment(parts[1].trim());
                         } else {
                             unknownOption = true;
                         }
@@ -305,4 +220,82 @@ public class Blacklist {
             }
         }
     }
+    
+    /**
+     * Get the last event.
+     * 
+     * @return
+     */
+    public BlacklistEvent getLastEvent() {
+        return lastEvent;
+    }
+    
+    /**
+     * Notify administrators.
+     * 
+     * @param event
+     */
+    public void notify(BlacklistEvent event, String comment) {
+        lastEvent = event;
+        
+        broadcastNotification(ChatColor.GRAY + "WG: " 
+                + ChatColor.LIGHT_PURPLE + event.getPlayer().getName()
+                + ChatColor.GOLD + " (" + event.getDescription() + ") "
+                + ChatColor.WHITE
+                + getFriendlyItemName(event.getType())
+                + (comment != null ? " (" + comment + ")" : "") + ".");
+    }
+    
+    /**
+     * Sends a notification to all subscribing users.
+     * 
+     * @param msg
+     */
+    public abstract void broadcastNotification(String msg);
+
+    /**
+     * Forget a player.
+     *
+     * @param player
+     */
+    public void forgetPlayer(LocalPlayer player) {
+        lastAffected.remove(player.getName());
+    }
+
+    /**
+     * Forget all players.
+     *
+     * @param player
+     */
+    public void forgetAllPlayers() {
+        lastAffected.clear();
+    }
+
+    /**
+     * Get an item's ID from its name.
+     * 
+     * @param name
+     */
+    private static int getItemID(String name) {
+        ItemType type = ItemType.lookup(name);
+        if (type != null) {
+            return type.getID();
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     * Get an item's friendly name with its ID.
+     * 
+     * @param id
+     */
+    private static String getFriendlyItemName(int id) {
+        ItemType type = ItemType.fromID(id);
+        if (type != null) {
+            return type.getName() + " (#" + id + ")";
+        } else {
+            return "#" + id + "";
+        }
+    }
 }

src/com/sk89q/worldguard/blacklist/BlacklistEntry.java

@@ -0,0 +1,383 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist;
+
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.HashMap;
+import org.bukkit.ChatColor;
+import com.sk89q.worldedit.blocks.ItemType;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+
+/**
+ *
+ * @author sk89q
+ */
+public class BlacklistEntry {
+    /**
+     * Parent blacklist entry.
+     */
+    private Blacklist blacklist;
+    /**
+     * List of groups to not affect.
+     */
+    private Set<String> ignoreGroups;
+    
+    private String[] breakActions;
+    private String[] destroyWithActions;
+    private String[] placeActions;
+    private String[] interactActions;
+    private String[] useActions;
+    private String[] dropActions;
+    private String[] acquireActions;
+    
+    private String message;
+    private String comment;
+
+    /**
+     * Construct the object.
+     * 
+     * @param blacklist
+     */
+    public BlacklistEntry(Blacklist blacklist) {
+        this.blacklist = blacklist;
+    }
+
+    /**
+     * @return the ignoreGroups
+     */
+    public String[] getIgnoreGroups() {
+        return ignoreGroups.toArray(new String[ignoreGroups.size()]);
+    }
+
+    /**
+     * @param ignoreGroups the ignoreGroups to set
+     */
+    public void setIgnoreGroups(String[] ignoreGroups) {
+        Set<String> ignoreGroupsSet = new HashSet<String>();
+        for (String group : ignoreGroups) {
+            ignoreGroupsSet.add(group.toLowerCase());
+        }
+        this.ignoreGroups = ignoreGroupsSet;
+    }
+
+    /**
+     * @return
+     */
+    public String[] getBreakActions() {
+        return breakActions;
+    }
+
+    /**
+     * @param actions
+     */
+    public void setBreakActions(String[] actions) {
+        this.breakActions = actions;
+    }
+
+    /**
+     * @return
+     */
+    public String[] getDestroyWithActions() {
+        return destroyWithActions;
+    }
+
+    /**
+     * @param action
+     */
+    public void setDestroyWithActions(String[] actions) {
+        this.destroyWithActions = actions;
+    }
+
+    /**
+     * @return
+     */
+    public String[] getPlaceActions() {
+        return placeActions;
+    }
+
+    /**
+     * @param actions
+     */
+    public void setPlaceActions(String[] actions) {
+        this.placeActions = actions;
+    }
+
+    /**
+     * @return
+     */
+    public String[] getInteractActions() {
+        return interactActions;
+    }
+
+    /**
+     * @param actions
+     */
+    public void setInteractActions(String[] actions) {
+        this.interactActions = actions;
+    }
+
+    /**
+     * @return
+     */
+    public String[] getUseActions() {
+        return useActions;
+    }
+
+    /**
+     * @param actions
+     */
+    public void setUseActions(String[] actions) {
+        this.useActions = actions;
+    }
+
+    /**
+     * @return
+     */
+    public String[] getDropActions() {
+        return dropActions;
+    }
+
+    /**
+     * @param actions
+     */
+    public void setDropActions(String[] actions) {
+        this.dropActions = actions;
+    }
+
+    /**
+     * @return
+     */
+    public String[] getAcquireActions() {
+        return acquireActions;
+    }
+
+    /**
+     * @param actions
+     */
+    public void setAcquireActions(String[] actions) {
+        this.acquireActions = actions;
+    }
+
+    /**
+     * @return the message
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * @param message the message to set
+     */
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    /**
+     * @return the comment
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * @param comment the comment to set
+     */
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    /**
+     * Returns true if this player should be ignored.
+     *
+     * @param player
+     * @return
+     */
+    public boolean shouldIgnore(LocalPlayer player) {
+        if (ignoreGroups == null) {
+            return false;
+        }
+        for (String group : player.getGroups()) {
+            if (ignoreGroups.contains(group.toLowerCase())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+    
+    /**
+     * Get the associated actions with an event.
+     * 
+     * @param event
+     * @return
+     */
+    private String[] getActions(BlacklistEvent event) {
+        if (event instanceof BlockBreakBlacklistEvent) {
+            return breakActions;
+            
+        } else if (event instanceof BlockPlaceBlacklistEvent) {
+            return placeActions;
+            
+        } else if (event instanceof BlockInteractBlacklistEvent) {
+            return interactActions;
+            
+        } else if (event instanceof DestroyWithBlacklistEvent) {
+            return destroyWithActions;
+            
+        } else if (event instanceof ItemAcquireBlacklistEvent) {
+            return acquireActions;
+            
+        } else if (event instanceof ItemDropBlacklistEvent) {
+            return dropActions;
+            
+        } else if (event instanceof ItemUseBlacklistEvent) {
+            return useActions;
+            
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Method to handle the event.
+     * 
+     * @param event
+     * @param forceRepeat
+     * @param silent
+     * @return
+     */
+    public boolean check(BlacklistEvent event, boolean forceRepeat, boolean silent) {
+        LocalPlayer player = event.getPlayer();
+        
+        if (shouldIgnore(player)) {
+            return true;
+        }
+
+        String name = player.getName();
+        long now = System.currentTimeMillis();
+        boolean repeating = false;
+
+        // Check to see whether this event is being repeated
+        BlacklistTrackedEvent tracked = blacklist.lastAffected.get(name);
+        if (tracked != null) {
+            if (tracked.matches(event, now)) {
+                repeating = true;
+            }
+        } else {
+            blacklist.lastAffected.put(name, new BlacklistTrackedEvent(event, now));
+        }
+
+        String actions[] = getActions(event);
+        boolean ret = true;
+        
+        // Nothing to do
+        if (actions == null) {
+            return true;
+        }
+        
+        for (String action : actions) {
+            // Deny
+            if (action.equalsIgnoreCase("deny")) {
+                if (silent) {
+                    return false;
+                }
+                
+                ret = false;
+
+            // Kick
+            } else if (action.equalsIgnoreCase("kick")) {
+                if (silent) {
+                    continue;
+                }
+                
+                if (this.message != null) {
+                    player.kick(String.format(this.message,
+                            getFriendlyItemName(event.getType())));
+                } else {
+                    player.kick("You can't " + event.getDescription() + " "
+                            + getFriendlyItemName(event.getType()));
+                }
+
+            // Ban
+            } else if (action.equalsIgnoreCase("ban")) {
+                if (silent) {
+                    continue;
+                }
+                
+                if (this.message != null) {
+                    player.ban("Banned: " + String.format(this.message,
+                            getFriendlyItemName(event.getType())));
+                } else {
+                    player.ban("Banned: You can't "
+                            + event.getDescription() + " "
+                            + getFriendlyItemName(event.getType()));
+                }
+            
+            } else if (!silent && (!repeating || forceRepeat)) {
+                // Notify
+                if (action.equalsIgnoreCase("notify")) {
+                    blacklist.notify(event, comment);
+                
+                // Log
+                } else if (action.equalsIgnoreCase("log")) {
+                    blacklist.getLogger().logEvent(event, comment);
+
+                // Tell
+                } else if (action.equalsIgnoreCase("tell")) {
+                    if (this.message != null) {
+                        player.printRaw(ChatColor.YELLOW +
+                                String.format(message, getFriendlyItemName(event.getType()))
+                                + ".");
+                    } else {
+                        player.printRaw(ChatColor.YELLOW + "You're not allowed to "
+                                + event.getDescription() + " "
+                                + getFriendlyItemName(event.getType()) + ".");
+                    }
+                }
+            }
+        }
+
+        return ret;
+    }
+
+    /**
+     * Get an item's friendly name with its ID.
+     * 
+     * @param id
+     */
+    private static String getFriendlyItemName(int id) {
+        ItemType type = ItemType.fromID(id);
+        if (type != null) {
+            return type.getName() + " (#" + id + ")";
+        } else {
+            return "#" + id + "";
+        }
+    }
+}

src/com/sk89q/worldguard/blacklist/BlacklistLogger.java

@@ -17,8 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+package com.sk89q.worldguard.blacklist;
+
 import java.util.Set;
 import java.util.HashSet;
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+import com.sk89q.worldguard.blacklist.loggers.BlacklistLoggerHandler;
 
 /**
  *
@@ -57,64 +61,16 @@ public class BlacklistLogger implements BlacklistLoggerHandler {
     public void clearHandlers() {
         handlers.clear();
     }
-
+    
     /**
-     * Log a block destroy attempt.
+     * Log an event.
      *
      * @param player
-     * @param block
+     * @param event
      */
-    public void logDestroyAttempt(Player player, Block block) {
+    public void logEvent(BlacklistEvent event, String comment) {
         for (BlacklistLoggerHandler handler : handlers) {
-            handler.logDestroyAttempt(player, block);
-        }
-    }
-
-    /**
-     * Log a right click on attempt.
-     *
-     * @param player
-     * @param block
-     */
-    public void logUseAttempt(Player player, Block block) {
-        for (BlacklistLoggerHandler handler : handlers) {
-            handler.logUseAttempt(player, block);
-        }
-    }
-
-    /**
-     * Right a left click attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logDestroyWithAttempt(Player player, int item) {
-        for (BlacklistLoggerHandler handler : handlers) {
-            handler.logDestroyWithAttempt(player, item);
-        }
-    }
-
-    /**
-     * Log a right click attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logCreateAttempt(Player player, int item) {
-        for (BlacklistLoggerHandler handler : handlers) {
-            handler.logCreateAttempt(player, item);
-        }
-    }
-
-    /**
-     * Log a right click attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logDropAttempt(Player player, int item) {
-        for (BlacklistLoggerHandler handler : handlers) {
-            handler.logDropAttempt(player, item);
+            handler.logEvent(event, comment);
         }
     }
 

src/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java

@@ -1,3 +1,6 @@
+package com.sk89q.worldguard.blacklist;
+
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 // $Id$
 /*
  * WorldGuard
@@ -22,7 +25,7 @@
  * @author sk89q
  */
 public class BlacklistTrackedEvent {
-    private int id;
+    private BlacklistEvent event;
     private long time;
 
     /**
@@ -31,36 +34,14 @@ public class BlacklistTrackedEvent {
      * @param id
      * @param time
      */
-    public BlacklistTrackedEvent(int id, long time) {
-        this.id = id;
+    public BlacklistTrackedEvent(BlacklistEvent event, long time) {
+        this.event = event;
         this.time = time;
     }
 
-    /**
-     * @return the id
-     */
-    public int getId() {
-        return id;
-    }
-
-    /**
-     * @param id the id to set
-     */
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    /**
-     * @return the time
-     */
-    public long getTime() {
-        return time;
-    }
-
-    /**
-     * @param time the time to set
-     */
-    public void setTime(long time) {
-        this.time = time;
+    public boolean matches(BlacklistEvent other, long now) {
+        return other.getType() == event.getType()
+                && time > now - 3000
+                && other.getClass() == event.getClass();
     }
 }

src/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java

@@ -0,0 +1,85 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+/**
+ * Represents a blacklist event.
+ * 
+ * @author sk89q
+ */
+public abstract class BlacklistEvent {
+    private Vector pos;
+    private int type;
+    
+    /**
+     * Holds the player that triggered the event.
+     */
+    private LocalPlayer player;
+    
+    /**
+     * Construct the object.
+     * 
+     * @param player
+     * @param pos
+     * @param type
+     */
+    public BlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        this.player = player;
+        this.pos = pos;
+        this.type = type;
+    }
+    
+    /**
+     * Get the player.
+     * 
+     * @return
+     */
+    public LocalPlayer getPlayer() {
+        return player;
+    }
+    
+    /**
+     * Get the position.
+     * 
+     * @return
+     */
+    public Vector getPosition() {
+        return pos;
+    }
+    
+    /**
+     * Get the type.
+     * 
+     * @return
+     */
+    public int getType() {
+        return type;
+    }
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
+    public abstract String getDescription();
+}

src/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java

@@ -0,0 +1,29 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public abstract class BlockBlacklistEvent extends BlacklistEvent {
+    public BlockBlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        super(player, pos, type);
+    }
+}

src/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java

@@ -0,0 +1,38 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class BlockBreakBlacklistEvent extends BlockBlacklistEvent {
+    public BlockBreakBlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        super(player, pos, type);
+    }
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
+    public String getDescription() {
+        return "break";
+    }
+}

src/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java

@@ -0,0 +1,38 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class BlockInteractBlacklistEvent extends BlockBlacklistEvent {
+    public BlockInteractBlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        super(player, pos, type);
+    }
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
+    public String getDescription() {
+        return "interact with";
+    }
+}

src/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java

@@ -0,0 +1,38 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class BlockPlaceBlacklistEvent extends BlockBlacklistEvent {
+    public BlockPlaceBlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        super(player, pos, type);
+    }
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
+    public String getDescription() {
+        return "place";
+    }
+}

src/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java

@@ -0,0 +1,38 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class DestroyWithBlacklistEvent extends BlacklistEvent {
+    public DestroyWithBlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        super(player, pos, type);
+    }
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
+    public String getDescription() {
+        return "destroy with";
+    }
+}

src/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java

@@ -0,0 +1,38 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class ItemAcquireBlacklistEvent extends ItemBlacklistEvent {
+    public ItemAcquireBlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        super(player, pos, type);
+    }
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
+    public String getDescription() {
+        return "acquire";
+    }
+}

src/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java

@@ -0,0 +1,29 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public abstract class ItemBlacklistEvent extends BlacklistEvent {
+    public ItemBlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        super(player, pos, type);
+    }
+}

src/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java

@@ -0,0 +1,38 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class ItemDropBlacklistEvent extends ItemBlacklistEvent {
+    public ItemDropBlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        super(player, pos, type);
+    }
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
+    public String getDescription() {
+        return "drop";
+    }
+}

src/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java

@@ -0,0 +1,38 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.events;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class ItemUseBlacklistEvent extends ItemBlacklistEvent {
+    public ItemUseBlacklistEvent(LocalPlayer player, Vector pos, int type) {
+        super(player, pos, type);
+    }
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
+    public String getDescription() {
+        return "use";
+    }
+}

src/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java

@@ -17,6 +17,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+package com.sk89q.worldguard.blacklist.loggers;
+
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+
 /**
  * Interface for loggers for the blacklist.
  *
@@ -24,40 +28,13 @@
  */
 public interface BlacklistLoggerHandler {
     /**
-     * Log a block destroy attempt.
+     * Log an event.
      *
-     * @param player
-     * @param block
+     * @param event
+     * @param comment
      */
-    public void logDestroyAttempt(Player player, Block block);
-    /**
-     * Log a right click on attempt.
-     * 
-     * @param player
-     * @param block
-     */
-    public void logUseAttempt(Player player, Block block);
-    /**
-     * Right a left click attempt.
-     * 
-     * @param player
-     * @param item
-     */
-    public void logDestroyWithAttempt(Player player, int item);
-    /**
-     * Log a right click attempt.
-     * 
-     * @param player
-     * @param item
-     */
-    public void logCreateAttempt(Player player, int item);
-    /**
-     * Log a drop attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logDropAttempt(Player player, int item);
+    public void logEvent(BlacklistEvent event, String comment);
+    
     /**
      * Close the logger.
      */

src/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java

@@ -0,0 +1,118 @@
+package com.sk89q.worldguard.blacklist.loggers;
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+import com.sk89q.worldedit.blocks.ItemType;
+import com.sk89q.worldguard.blacklist.events.*;
+
+/**
+ *
+ * @author sk89q
+ */
+public class ConsoleLoggerHandler implements BlacklistLoggerHandler {
+    /**
+     * Logger.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+    
+    /**
+     * Log an event.
+     *
+     * @param player
+     * @param event
+     */
+    public void logEvent(BlacklistEvent event, String comment) {
+        // Block break
+        if (event instanceof BlockBreakBlacklistEvent) {
+            BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
+                    + " tried to break " + getFriendlyItemName(evt.getType())
+                    + (comment != null ? " (" + comment + ")" : ""));
+        
+        // Block place
+        } else if (event instanceof BlockPlaceBlacklistEvent) {
+            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
+                    + " tried to place " + getFriendlyItemName(evt.getType())
+                    + (comment != null ? " (" + comment + ")" : ""));
+        
+        // Block interact
+        } else if (event instanceof BlockPlaceBlacklistEvent) {
+            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
+                    + " tried to interact with " + getFriendlyItemName(evt.getType())
+                    + (comment != null ? " (" + comment + ")" : ""));
+        
+        // Destroy with
+        } else if (event instanceof DestroyWithBlacklistEvent) {
+            DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
+                    + " tried to destroy with " + getFriendlyItemName(evt.getType())
+                    + (comment != null ? " (" + comment + ")" : ""));
+        
+        // Acquire
+        } else if (event instanceof ItemAcquireBlacklistEvent) {
+            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
+                    + " tried to acquire " + getFriendlyItemName(evt.getType())
+                    + (comment != null ? " (" + comment + ")" : ""));
+        
+        // Drop
+        } else if (event instanceof ItemDropBlacklistEvent) {
+            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
+                    + " tried to drop " + getFriendlyItemName(evt.getType())
+                    + (comment != null ? " (" + comment + ")" : ""));
+        
+        // Use
+        } else if (event instanceof ItemUseBlacklistEvent) {
+            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
+                    + " tried to use " + getFriendlyItemName(evt.getType())
+                    + (comment != null ? " (" + comment + ")" : ""));
+        
+        // Unknown
+        } else {
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
+                    + " caught unknown event: " + event.getClass().getCanonicalName());
+        }
+    }
+
+    /**
+     * Get an item's friendly name with its ID.
+     * 
+     * @param id
+     */
+    private static String getFriendlyItemName(int id) {
+        ItemType type = ItemType.fromID(id);
+        if (type != null) {
+            return type.getName() + " (#" + id + ")";
+        } else {
+            return "#" + id + "";
+        }
+    }
+
+    /**
+     * Close the connection.
+     */
+    public void close() {
+    }
+}

src/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java

@@ -0,0 +1,198 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.loggers;
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.PreparedStatement;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+
+/**
+ *
+ * @author sk89q
+ */
+public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
+    /**
+     * Logger.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+
+    /**
+     * DSN.
+     */
+    private String dsn;
+    /**
+     * Username.
+     */
+    private String user;
+    /**
+     * Password.
+     */
+    private String pass;
+    /**
+     * Table.
+     */
+    private String table;
+    /**
+     * Database connection.
+     */
+    private Connection conn;
+
+    /**
+     * Construct the object.
+     * 
+     * @param dsn
+     * @param user
+     * @param pass
+     */
+    public DatabaseLoggerHandler(String dsn, String user, String pass, String table) {
+        this.dsn = dsn;
+        this.user = user;
+        this.pass = pass;
+        this.table = table;
+    }
+
+    /**
+     * Gets the database connection.
+     * 
+     * @return
+     * @throws SQLException
+     */
+    private Connection getConnection() throws SQLException {
+        if (conn == null || conn.isClosed()) {
+            conn = DriverManager.getConnection(dsn, user, pass);
+        }
+        return conn;
+    }
+
+    /**
+     * Log an event to the database.
+     * 
+     * @param event
+     * @param name
+     * @param x
+     * @param y
+     * @param z
+     * @param item
+     * @param comment
+     */
+    private void logEvent(String event, LocalPlayer player, Vector pos, int item,
+            String comment) {
+        try {
+            Connection conn = getConnection();
+            PreparedStatement stmt = conn.prepareStatement(
+                    "INSERT INTO " + table
+                  + "(event, player, x, y, z, item, time, comment) VALUES "
+                  + "(?, ?, ?, ?, ?, ?, ?, ?)");
+            stmt.setString(1, event);
+            stmt.setString(2, player.getName());
+            stmt.setInt(3, pos.getBlockX());
+            stmt.setInt(4, pos.getBlockY());
+            stmt.setInt(5, pos.getBlockZ());
+            stmt.setInt(6, item);
+            stmt.setInt(7, (int)(System.currentTimeMillis() / 1000));
+            stmt.setString(8, comment);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            logger.log(Level.SEVERE, "Failed to log blacklist event to database: "
+                    + e.getMessage());
+        }
+    }
+    
+    /**
+     * Log an event.
+     *
+     * @param player
+     * @param event
+     */
+    public void logEvent(BlacklistEvent event, String comment) {
+        // Block break
+        if (event instanceof BlockBreakBlacklistEvent) {
+            BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
+            logEvent("BREAK", evt.getPlayer(), evt.getPosition(),
+                    evt.getType(), comment);
+        
+        // Block place
+        } else if (event instanceof BlockPlaceBlacklistEvent) {
+            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
+            logEvent("PLACE", evt.getPlayer(), evt.getPosition(),
+                    evt.getType(), comment);
+            
+        // Block interact
+        } else if (event instanceof BlockPlaceBlacklistEvent) {
+            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
+            logEvent("INTERACT", evt.getPlayer(), evt.getPosition(),
+                    evt.getType(), comment);
+        
+        // Destroy with
+        } else if (event instanceof DestroyWithBlacklistEvent) {
+            DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
+            logEvent("DESTROY_WITH", evt.getPlayer(), evt.getPosition(),
+                    evt.getType(), comment);
+        
+        // Acquire
+        } else if (event instanceof ItemAcquireBlacklistEvent) {
+            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
+            logEvent("ACQUIRE", evt.getPlayer(), evt.getPlayer().getPosition(),
+                    evt.getType(), comment);
+        
+        // Drop
+        } else if (event instanceof ItemDropBlacklistEvent) {
+            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
+            logEvent("DROP", evt.getPlayer(), evt.getPlayer().getPosition(),
+                    evt.getType(), comment);
+        
+        // Use
+        } else if (event instanceof ItemUseBlacklistEvent) {
+            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
+            logEvent("USE", evt.getPlayer(), evt.getPlayer().getPosition(),
+                    evt.getType(), comment);
+        
+        // Unknown
+        } else {
+            logEvent("UNKNOWN", event.getPlayer(), event.getPlayer().getPosition(),
+                    -1, comment);
+        }
+    }
+
+    /**
+     * Close the connection.
+     */
+    public void close() {
+        try {
+            if (conn != null && !conn.isClosed()) {
+                conn.close();
+            }
+        } catch (SQLException e) {
+            
+        }
+    }
+}

src/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java

@@ -17,17 +17,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+package com.sk89q.worldguard.blacklist.loggers;
+
 import java.util.logging.Logger;
 import java.util.logging.Level;
 import java.io.*;
 import java.util.regex.*;
-import java.util.Map;
-import java.util.Date;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.TreeMap;
-import java.util.Iterator;
+import java.util.*;
 import java.text.SimpleDateFormat;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.ItemType;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.*;
 
 /**
  *
@@ -93,8 +94,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
     private String buildPath(String playerName) {
         GregorianCalendar calendar = new GregorianCalendar();
 
-        Pattern p = Pattern.compile("%.");
-        Matcher m = p.matcher(pathPattern);
+        Matcher m = pattern.matcher(pathPattern);
         StringBuffer buffer = new StringBuffer();
 
         // Pattern replacements
@@ -143,11 +143,12 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
      * @param player
      * @param message
      */
-    private void log(Player player, String message) {
+    private void log(LocalPlayer player, String message, String comment) {
         String path = buildPath(player.getName());
         try {
             String date = dateFormat.format(new Date());
-            String line = "[" + date + "] " + player.getName() + ": " + message + "\r\n";
+            String line = "[" + date + "] " + player.getName() + ": " + message
+                    + (comment != null ? " (" + comment + ")" : "") + "\r\n";
             
             FileLoggerWriter writer = writers.get(path);
 
@@ -206,53 +207,67 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
     }
 
     /**
-     * Log a block destroy attempt.
-     *
-     * @param player
-     * @param block
+     * Gets the coordinates in text form for the log.
+     * 
+     * @param pos
+     * @return
      */
-    public void logDestroyAttempt(Player player, Block block) {
-        log(player, "Tried to destroy " + getFriendlyItemName(block.getType()));
+    private String getCoordinates(Vector pos) {
+        return "@" + pos.getBlockX() + "," + pos.getBlockY() + "," + pos.getBlockZ();
     }
-
-    /**
-     * Log a right click on attempt.
-     *
-     * @param player
-     * @param block
-     */
-    public void logUseAttempt(Player player, Block block) {
-        log(player, "Tried to use " + getFriendlyItemName(block.getType()));
+    
+    private void logEvent(BlacklistEvent event, String text, int id, Vector pos, String comment) {
+        log(event.getPlayer(), "Tried to " + text + " " + getFriendlyItemName(id)
+                + " " + getCoordinates(pos), comment);
     }
-
+    
     /**
-     * Log an attempt to destroy with an item.
+     * Log an event.
      *
      * @param player
-     * @param item
+     * @param event
      */
-    public void logDestroyWithAttempt(Player player, int item) {
-        log(player, "Tried to destroy with " + getFriendlyItemName(item));
-    }
-
-    /**
-     * Log a block creation attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logCreateAttempt(Player player, int item) {
-        log(player, "Tried to create " + getFriendlyItemName(item));
-    }
-
-    /**
-     * Log a drop attempt.
-     *
-     * @param player
-     * @param item
-     */
-    public void logDropAttempt(Player player, int item) {
-        log(player, "Tried to drop " + getFriendlyItemName(item));
+    public void logEvent(BlacklistEvent event, String comment) {
+        // Block break
+        if (event instanceof BlockBreakBlacklistEvent) {
+            BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
+            logEvent(event, "break", evt.getType(), evt.getPosition(), comment);
+        
+        // Block place
+        } else if (event instanceof BlockPlaceBlacklistEvent) {
+            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
+            logEvent(event, "place", evt.getType(), evt.getPosition(), comment);
+        
+        // Block interact
+        } else if (event instanceof BlockInteractBlacklistEvent) {
+            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
+            logEvent(event, "interact with", evt.getType(), evt.getPosition(), comment);
+        
+        // Destroy with
+        } else if (event instanceof DestroyWithBlacklistEvent) {
+            DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
+            logEvent(event, "destroy with", evt.getType(), evt.getPosition(), comment);
+            
+        // Acquire
+        } else if (event instanceof ItemAcquireBlacklistEvent) {
+            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
+            logEvent(event, "acquire", evt.getType(), evt.getPosition(), comment);
+        
+        // Drop
+        } else if (event instanceof ItemDropBlacklistEvent) {
+            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
+            logEvent(event, "drop", evt.getType(), evt.getPosition(), comment);
+            
+        // Use
+        } else if (event instanceof ItemUseBlacklistEvent) {
+            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
+            logEvent(event, "use", evt.getType(), evt.getPosition(), comment);
+        
+        // Unknown
+        } else {
+            log(event.getPlayer(), "Unknown event: "
+                    + event.getClass().getCanonicalName(), comment);
+        }
     }
 
     /**
@@ -261,7 +276,12 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
      * @param id
      */
     private static String getFriendlyItemName(int id) {
-        return etc.getDataSource().getItem(id) + " (#" + id + ")";
+        ItemType type = ItemType.fromID(id);
+        if (type != null) {
+            return type.getName() + " (#" + id + ")";
+        } else {
+            return "#" + id + "";
+        }
     }
 
     /**

src/com/sk89q/worldguard/blacklist/loggers/FileLoggerWriter.java

@@ -17,6 +17,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+package com.sk89q.worldguard.blacklist.loggers;
+
 import java.io.*;
 
 /**

src/com/sk89q/worldguard/bukkit/BukkitBlacklist.java

@@ -0,0 +1,40 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.entity.Player;
+import com.sk89q.worldguard.blacklist.Blacklist;
+
+public class BukkitBlacklist extends Blacklist {
+    private WorldGuardPlugin plugin;
+    
+    public BukkitBlacklist(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+    
+    public void broadcastNotification(String msg) {
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            if (plugin.hasPermission(player, "/worldguardnotify")) {
+                player.sendMessage(msg);
+            }
+        }
+    }
+
+}

src/com/sk89q/worldguard/bukkit/BukkitPlayer.java

@@ -0,0 +1,73 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import java.util.List;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class BukkitPlayer extends LocalPlayer {
+    private Player player;
+    private WorldGuardPlugin plugin;
+    
+    public BukkitPlayer(WorldGuardPlugin plugin, Player player) {
+        this.plugin = plugin;
+        this.player = player;
+    }
+
+    @Override
+    public String getName() {
+        return player.getName();
+    }
+
+    @Override
+    public boolean hasGroup(String group) {
+        return plugin.inGroup(player, group);
+    }
+
+    @Override
+    public Vector getPosition() {
+        Location loc = player.getLocation();
+        return new Vector(loc.getX(), loc.getY(), loc.getZ());
+    }
+
+    @Override
+    public void kick(String msg) {
+        player.kickPlayer(msg);
+    }
+
+    @Override
+    public void ban(String msg) {
+        player.kickPlayer(msg);
+    }
+
+    @Override
+    public List<String> getGroups() {
+        return plugin.getGroups(player);
+    }
+
+    @Override
+    public void printRaw(String msg) {
+        player.sendMessage(msg);
+    }
+
+}

src/com/sk89q/worldguard/bukkit/BukkitUtil.java

@@ -0,0 +1,53 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import java.util.List;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+
+public class BukkitUtil {
+    private BukkitUtil()  {
+    }
+    
+    public static BlockVector toVector(Block block) {
+        return new BlockVector(block.getX(), block.getY(), block.getZ());
+    }
+    
+    public static Vector toVector(Location loc) {
+        return new Vector(loc.getX(), loc.getY(), loc.getZ());
+    }
+    
+    public static Vector toVector(org.bukkit.util.Vector vector) {
+        return new Vector(vector.getX(), vector.getY(), vector.getZ());
+    }
+    
+    public static Player matchSinglePlayer(Server server, String name) {
+        List<Player> players = server.matchPlayer(name);
+        if (players.size() == 0) {
+            return null;
+        }
+        return players.get(0);
+    }
+}

src/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java

@@ -0,0 +1,65 @@
+package com.sk89q.worldguard.bukkit;
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+/**
+ * Sends all logger messages to a player.
+ *
+ * @author sk89q
+ */
+public class LoggerToChatHandler extends Handler {
+    /**
+     * Player.
+     */
+    private Player player;
+
+    /**
+     * Construct the object.
+     * 
+     * @param player
+     */
+    public LoggerToChatHandler(Player player) {
+        this.player = player;
+    }
+
+    /**
+     * Close the handler.
+     */
+    public void close() {
+    }
+
+    /**
+     * Flush the output.
+     */
+    public void flush() {
+    }
+
+    /**
+     * Publish a log record.
+     */
+    public void publish(LogRecord record) {
+        player.sendMessage(ChatColor.GRAY + record.getLevel().getName() + ": "
+                + ChatColor.WHITE + record.getMessage());
+    }
+}

src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java

@@ -0,0 +1,371 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import java.util.Iterator;
+import java.util.List;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockDamageLevel;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.World;
+import org.bukkit.event.block.*;
+import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
+import org.bukkit.inventory.ItemStack;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.*;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+
+public class WorldGuardBlockListener extends BlockListener {
+    /**
+     * Plugin.
+     */
+    private WorldGuardPlugin plugin;
+    
+    /**
+     * Construct the object;
+     * 
+     * @param plugin
+     */
+    public WorldGuardBlockListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Called when a block is damaged (or broken)
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockDamage(BlockDamageEvent event) {
+        Player player = event.getPlayer();
+
+        if (!plugin.itemDurability && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+            ItemStack held = player.getItemInHand();
+            held.setDamage((byte)-1);
+            player.setItemInHand(held);
+        }
+        
+        if (plugin.useRegions && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+            Vector pt = BukkitUtil.toVector(event.getBlock());
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+            
+            if (!plugin.hasPermission(player, "/regionbypass")
+                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+        
+        if (plugin.blacklist != null && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+            if (!plugin.blacklist.check(
+                    new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(event.getBlock()),
+                            event.getBlock().getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (!plugin.blacklist.check(
+                    new DestroyWithBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(event.getBlock()),
+                            player.getItemInHand().getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a block flows (water/lava)
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockFlow(BlockFromToEvent event) {
+        World world = event.getBlock().getWorld();
+        Block blockFrom = event.getBlock();
+        Block blockTo = event.getToBlock();
+        
+        boolean isWater = blockFrom.getTypeId() == 8 || blockFrom.getTypeId() == 9;
+        boolean isLava = blockFrom.getTypeId() == 10 || blockFrom.getTypeId() == 11;
+
+        if (plugin.simulateSponge && isWater) {
+            int ox = blockTo.getX();
+            int oy = blockTo.getY();
+            int oz = blockTo.getZ();
+
+            for (int cx = -plugin.spongeRadius; cx <= plugin.spongeRadius; cx++) {
+                for (int cy = -plugin.spongeRadius; cy <= plugin.spongeRadius; cy++) {
+                    for (int cz = -plugin.spongeRadius; cz <= plugin.spongeRadius; cz++) {
+                        if (world.getBlockTypeIdAt(ox + cx, oy + cy, oz + cz) == 19) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (plugin.classicWater && isWater) {
+            int blockBelow = world.getBlockTypeIdAt(blockFrom.getX(), blockFrom.getY() - 1, blockFrom.getZ());
+            if (blockBelow != 0 && blockBelow != 8 && blockBelow != 9) {
+                world.getBlockAt(blockFrom.getX(), blockFrom.getY(), blockFrom.getZ()).setTypeId(9);
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (plugin.preventWaterDamage.size() > 0 && isWater) {
+            int targetId = world.getBlockTypeIdAt(
+                    blockTo.getX(), blockTo.getY(), blockTo.getZ());
+            if (plugin.preventWaterDamage.contains(targetId)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (plugin.allowedLavaSpreadOver.size() > 0 && isLava) {
+            int targetId = world.getBlockTypeIdAt(
+                    blockTo.getX(), blockTo.getY() - 1, blockTo.getZ());
+            if (!plugin.allowedLavaSpreadOver.contains(targetId)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a block gets ignited
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockIgnite(BlockIgniteEvent event) {
+        IgniteCause cause = event.getCause();
+        Block block = event.getBlock();
+        Player player = event.getPlayer();
+        World world = block.getWorld();
+        boolean isFireSpread = cause == IgniteCause.SLOW_SPREAD
+                || cause == IgniteCause.SPREAD;
+        
+        if (plugin.preventLavaFire && cause == IgniteCause.LAVA) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.disableFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+        
+        if (plugin.blockLighter && cause == IgniteCause.FLINT_AND_STEEL) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.fireSpreadDisableToggle && isFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.disableFireSpreadBlocks.size() > 0 && isFireSpread) {
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
+            
+            if (plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y - 1, z))
+                    || plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x + 1, y, z))
+                    || plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x - 1, y, z))
+                    || plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z - 1))
+                    || plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z + 1))) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+        
+        if (plugin.useRegions && player != null && !plugin.hasPermission(player, "/regionbypass")) {
+            Vector pt = toVector(block);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+            
+            if (cause == IgniteCause.FLINT_AND_STEEL
+                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (cause == IgniteCause.FLINT_AND_STEEL
+                    && !plugin.regionManager.getApplicableRegions(pt).allowsLighter()) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when block physics occurs
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockPhysics(BlockPhysicsEvent event) {
+        int id = event.getChangedTypeId();
+
+        if (id == 13 && plugin.noPhysicsGravel) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (id == 12 && plugin.noPhysicsSand) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (id == 90 && plugin.allowPortalAnywhere) {
+            event.setCancelled(true);
+            return;
+        }
+    }
+    
+    /**
+     * Called when a block is interacted with
+     * 
+     * @param event Relevant event details
+     */
+    public void onBlockInteract(BlockInteractEvent event) {
+        Block block = event.getBlock();
+        LivingEntity entity = event.getEntity();
+        
+        if (entity instanceof Player && block.getType() == Material.CHEST) {
+            Player player = (Player)entity;
+            if (plugin.useRegions) {
+                Vector pt = toVector(block);
+                LocalPlayer localPlayer = plugin.wrapPlayer(player);
+    
+                if (!plugin.hasPermission(player, "/regionbypass")
+                        && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+        
+        if (plugin.blacklist != null && entity instanceof Player) {
+            Player player = (Player)entity;
+            
+            if (!plugin.blacklist.check(
+                    new BlockInteractBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
+                            block.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a player places a block
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockPlace(BlockPlaceEvent event) {
+        Block blockPlaced = event.getBlock();
+        Player player = event.getPlayer();
+        World world = blockPlaced.getWorld();
+        
+        if (plugin.useRegions) {
+            Vector pt = toVector(blockPlaced);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (!plugin.hasPermission(player, "/regionbypass")
+                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+        
+        if (plugin.blacklist != null) {
+            if (!plugin.blacklist.check(
+                    new BlockPlaceBlacklistEvent(plugin.wrapPlayer(player), toVector(blockPlaced),
+                            blockPlaced.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (plugin.simulateSponge && blockPlaced.getTypeId() == 19) {
+            int ox = blockPlaced.getX();
+            int oy = blockPlaced.getY();
+            int oz = blockPlaced.getZ();
+
+            for (int cx = -plugin.spongeRadius; cx <= plugin.spongeRadius; cx++) {
+                for (int cy = -plugin.spongeRadius; cy <= plugin.spongeRadius; cy++) {
+                    for (int cz = -plugin.spongeRadius; cz <= plugin.spongeRadius; cz++) {
+                        int id = world.getBlockTypeIdAt(ox + cx, oy + cy, oz + cz);
+                        if (id == 8 || id == 9) {
+                            world.getBlockAt(ox + cx, oy + cy, oz + cz)
+                                    .setTypeId(0);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Called when a player right clicks a block
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockRightClick(BlockRightClickEvent event) {
+        Player player = event.getPlayer();
+        
+        if (plugin.useRegions && event.getItemInHand().getTypeId() == plugin.regionWand) {
+            Vector pt = toVector(event.getBlock());
+            ApplicableRegionSet app = plugin.regionManager.getApplicableRegions(pt);
+            List<String> regions = plugin.regionManager.getApplicableRegionsIDs(pt);
+            
+            if (regions.size() > 0) {
+                player.sendMessage(ChatColor.YELLOW + "Can you build? "
+                        + (app.canBuild(plugin.wrapPlayer(player)) ? "Yes" : "No"));
+                
+                StringBuilder str = new StringBuilder();
+                for (Iterator<String> it = regions.iterator(); it.hasNext(); ) {
+                    str.append(it.next());
+                    if (it.hasNext()) {
+                        str.append(", ");
+                    }
+                }
+                
+                player.sendMessage(ChatColor.YELLOW + "Applicable regions: " + str.toString());
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "WorldGuard: No defined regions here!");
+            }
+        }
+    }
+}

src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java

@@ -0,0 +1,113 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import com.sk89q.worldedit.Vector;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+
+public class WorldGuardEntityListener extends EntityListener {
+    /**
+     * Plugin.
+     */
+    private WorldGuardPlugin plugin;
+    
+    /**
+     * Construct the object;
+     * 
+     * @param plugin
+     */
+    public WorldGuardEntityListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
+        Entity defender = event.getEntity();
+        DamageCause type = event.getCause();
+        
+        if (defender instanceof Player) {
+            Player player = (Player)defender;
+
+            if (plugin.invinciblePlayers.contains(player.getName())) {
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (plugin.disableFallDamage && type == DamageCause.FALL) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (plugin.disableLavaDamage && type == DamageCause.LAVA) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (plugin.disableFireDamage && (type == DamageCause.FIRE
+                    || type == DamageCause.FIRE_TICK)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (plugin.disableDrowningDamage && type == DamageCause.DROWNING) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (type == DamageCause.DROWNING
+                    && plugin.amphibiousPlayers.contains(player.getName())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        Entity attacker = event.getDamager();
+        Entity defender = event.getEntity();
+        
+        if (defender instanceof Player) {
+            Player player = (Player)defender;
+
+            if (plugin.invinciblePlayers.contains(player.getName())) {
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (attacker != null && attacker instanceof Player) {
+                if (plugin.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    
+                    if (!plugin.regionManager.getApplicableRegions(pt).allowsPvP()) {
+                        player.sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+}

src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java

@@ -0,0 +1,788 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.bukkit.*;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.*;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.Plugin;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.blocks.ItemType;
+import com.sk89q.worldedit.bukkit.WorldEditAPI;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.*;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.domains.*;
+import com.sk89q.worldguard.protection.*;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+
+/**
+ * Handles all events thrown in relation to a Player
+ */
+public class WorldGuardPlayerListener extends PlayerListener {
+    /**
+     * Plugin.
+     */
+    private WorldGuardPlugin plugin;
+    /**
+     * Group pattern used to specify groups for the region command.
+     */
+    private static Pattern groupPattern = Pattern.compile("^[gG]:(.+)$");
+
+    private static int CMD_LIST_SIZE = 9;
+    
+    /**
+     * Construct the object;
+     * 
+     * @param plugin
+     */
+    public WorldGuardPlayerListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Called when a player joins a server
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerJoin(PlayerEvent event) {
+        Player player = event.getPlayer();
+        
+        if (plugin.fireSpreadDisableToggle) {
+            player.sendMessage(ChatColor.YELLOW
+                    + "Fire spread is currently globally disabled.");
+        }
+
+        if (plugin.inGroup(player, "wg-invincible")) {
+            plugin.invinciblePlayers.add(player.getName());
+        }
+
+        if (plugin.inGroup(player, "wg-amphibious")) {
+            plugin.amphibiousPlayers.add(player.getName());
+        }
+    }
+
+    /**
+     * Called when a player leaves a server
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerQuit(PlayerEvent event) {
+        Player player = event.getPlayer();
+        plugin.invinciblePlayers.remove(player.getName());
+        plugin.amphibiousPlayers.remove(player.getName());
+        if (plugin.blacklist != null) {
+            plugin.blacklist.forgetPlayer(plugin.wrapPlayer(player));
+        }
+    }
+    
+    /**
+     * Called when a player uses an item
+     * 
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerItem(PlayerItemEvent event) {
+        Player player = event.getPlayer();
+        Block block = event.getBlockClicked();
+        
+        if (plugin.useRegions && !event.isBlock() && event.getBlockClicked() != null) {
+            Vector pt = toVector(block.getRelative(event.getBlockFace()));
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+            
+            if (!plugin.hasPermission(player, "/regionbypass")
+                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED
+                        + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+        
+        if (plugin.blacklist != null) {
+            if (!plugin.blacklist.check(
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
+                            block.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a player attempts to log in to the server
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        Player player = event.getPlayer();
+        
+        if (plugin.enforceOneSession) {
+            String name = player.getName();
+            
+            for (Player pl : plugin.getServer().getOnlinePlayers()) {
+                if (pl.getName().equalsIgnoreCase(name)) {
+                    pl.kickPlayer("Logged in from another location.");
+                }
+            }
+        }
+    }
+
+    /**
+     * Called when a player attempts to use a command
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerCommand(PlayerChatEvent event) {
+        if (handleCommand(event)) {
+            event.setCancelled(true);
+        }
+    }
+
+    /**
+     * Called when a player attempts to use a command
+     *
+     * @param event Relevant event details
+     */
+    public boolean handleCommand(PlayerChatEvent event) {
+        Player player = event.getPlayer();
+        String[] split = event.getMessage().split(" ");
+        
+        if (split[0].equalsIgnoreCase("/stopfire") &&
+                plugin.hasPermission(player, "/stopfire")) {
+            if (!plugin.fireSpreadDisableToggle) {
+                plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                        + "Fire spread has been globally disabled by " + player.getName() + ".");
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "Fire spread was already globally disabled.");
+            }
+            
+            plugin.fireSpreadDisableToggle = true;
+        } else if (split[0].equalsIgnoreCase("/allowfire")
+                    && plugin.hasPermission(player, "/stopfire")) {
+            if (plugin.fireSpreadDisableToggle) {
+                plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                        + "Fire spread has been globally re-enabled by " + player.getName() + ".");
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "Fire spread was already globally enabled.");
+            }
+            
+            plugin.fireSpreadDisableToggle = false;
+        } else if (split[0].equalsIgnoreCase("/god")
+                    && plugin.hasPermission(player, "/god")) {
+            // Allow setting other people invincible
+            if (split.length > 1) {
+                if (!plugin.hasPermission(player, "/godother")) {
+                    player.sendMessage(ChatColor.RED + "You don't have permission to make others invincible.");
+                    return true;
+                }
+
+                Player other = matchSinglePlayer(plugin.getServer(), split[1]);
+                if (other == null) {
+                    player.sendMessage(ChatColor.RED + "Player not found.");
+                } else {
+                    if (!plugin.invinciblePlayers.contains(other.getName())) {
+                        plugin.invinciblePlayers.add(other.getName());
+                        player.sendMessage(ChatColor.YELLOW + other.getName() + " is now invincible!");
+                        other.sendMessage(ChatColor.YELLOW + player.getName() + " has made you invincible!");
+                    } else {
+                        plugin.invinciblePlayers.remove(other.getName());
+                        player.sendMessage(ChatColor.YELLOW + other.getName() + " is no longer invincible.");
+                        other.sendMessage(ChatColor.YELLOW + player.getName() + " has taken away your invincibility.");
+                    }
+                }
+            // Invincibility for one's self
+            } else {
+                if (!plugin.invinciblePlayers.contains(player.getName())) {
+                    plugin.invinciblePlayers.add(player.getName());
+                    player.sendMessage(ChatColor.YELLOW + "You are now invincible!");
+                } else {
+                    plugin.invinciblePlayers.remove(player.getName());
+                    player.sendMessage(ChatColor.YELLOW + "You are no longer invincible.");
+                }
+            }
+        } else if ((split[0].equalsIgnoreCase("/stack")
+                || split[0].equalsIgnoreCase("/;"))
+                    && plugin.hasPermission(player, "/stack")) {
+            ItemStack[] items = player.getInventory().getContents();
+            int len = items.length;
+
+            int affected = 0;
+            
+            for (int i = 0; i < len; i++) {
+                ItemStack item = items[i];
+
+                // Avoid infinite stacks and stacks with durability
+                if (item == null || item.getAmount() <= 0
+                        || ItemType.shouldNotStack(item.getTypeId())) {
+                    continue;
+                }
+
+                // Ignore buckets
+                if (item.getTypeId() >= 325 && item.getTypeId() <= 327) {
+                    continue;
+                }
+
+                if (item.getAmount() < 64) {
+                    int needed = 64 - item.getAmount(); // Number of needed items until 64
+
+                    // Find another stack of the same type
+                    for (int j = i + 1; j < len; j++) {
+                        ItemStack item2 = items[j];
+
+                        // Avoid infinite stacks and stacks with durability
+                        if (item2 == null || item2.getAmount() <= 0
+                                || ItemType.shouldNotStack(item.getTypeId())) {
+                            continue;
+                        }
+
+                        // Same type?
+                        // Blocks store their color in the damage value
+                        if (item2.getTypeId() == item.getTypeId() &&
+                                (!ItemType.usesDamageValue(item.getTypeId())
+                                        || item.getDamage() == item2.getDamage())) {
+                            // This stack won't fit in the parent stack
+                            if (item2.getAmount() > needed) {
+                                item.setAmount(64);
+                                item2.setAmount(item2.getAmount() - needed);
+                                break;
+                            // This stack will
+                            } else {
+                                items[j] = null;
+                                item.setAmount(item.getAmount() + item2.getAmount());
+                                needed = 64 - item.getAmount();
+                            }
+
+                            affected++;
+                        }
+                    }
+                }
+            }
+
+            if (affected > 0) {
+                player.getInventory().setContents(items);
+            }
+
+            player.sendMessage(ChatColor.YELLOW + "Items compacted into stacks!");
+        } else if (split[0].equalsIgnoreCase("/rg")
+                || split[0].equalsIgnoreCase("/region")) {
+            if (split.length < 2) {
+                player.sendMessage(ChatColor.RED + "/region <define|flag|delete|info|add|remove|list|save|load> ...");
+                return true;
+            }
+            
+            String action = split[1];
+            String[] args = new String[split.length - 1];
+            System.arraycopy(split, 1, args, 0, split.length - 1);
+            
+            handleRegionCommand(player, action, args);
+        } else if (split[0].equalsIgnoreCase("/reload")
+                && plugin.hasPermission(player, "/reload")
+                && split.length > 1) {
+            if (split[1].equalsIgnoreCase("WorldGuard")) {
+                LoggerToChatHandler handler = new LoggerToChatHandler(player);
+                handler.setLevel(Level.ALL);
+                Logger minecraftLogger = Logger.getLogger("Minecraft");
+                minecraftLogger.addHandler(handler);
+
+                try {
+                    plugin.loadConfiguration();
+                    plugin.postReload();
+                    player.sendMessage("WorldGuard configuration reloaded.");
+                } catch (Throwable t) {
+                    player.sendMessage("Error while reloading: "
+                            + t.getMessage());
+                } finally {
+                    minecraftLogger.removeHandler(handler);
+                }
+
+                return true;
+            }
+        } else {
+            return false;
+        }
+
+        return true;
+    }
+    
+    /**
+     * Handles a region command.
+     * 
+     * @param player
+     * @param action
+     * @param args
+     */
+    private void handleRegionCommand(Player player, String action, String[] args) {
+        if (!plugin.useRegions) {
+            player.sendMessage(ChatColor.RED + "Regions are disabled.");
+            return;
+        }
+        
+        if (action.equalsIgnoreCase("define")) {
+            if (!canUseRegionCommand(player, "/regiondefine")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
+                return;
+            }
+            
+            if (args.length < 2) {
+                player.sendMessage(ChatColor.RED + "/region define <id> [owner1 [owner2 [owners...]]]");
+                return;
+            }
+            
+            try {
+                String id = args[1].toLowerCase();
+                Plugin wePlugin = plugin.getServer().getPluginManager().getPlugin("WorldEdit");
+                if (plugin == null) {
+                    player.sendMessage(ChatColor.RED + "WorldEdit must be installed and enabled as a plugin.");
+                    return;
+                }
+                
+                WorldEditPlugin worldEdit = (WorldEditPlugin)wePlugin;
+                WorldEditAPI api = worldEdit.getAPI();
+                
+                LocalSession session = api.getSession(player);
+                Region weRegion = session.getRegion();
+                
+                BlockVector min = weRegion.getMinimumPoint().toBlockVector();
+                BlockVector max = weRegion.getMaximumPoint().toBlockVector();
+                
+                ProtectedRegion region = new ProtectedCuboidRegion(min, max);
+                if (args.length >= 3) {
+                    region.setOwners(parseDomainString(args, 2));
+                }
+                plugin.regionManager.addRegion(id, region);
+                plugin.regionLoader.save(plugin.regionManager);
+                player.sendMessage(ChatColor.YELLOW + "Region saved as " + id + ".");
+            } catch (IncompleteRegionException e) {
+                player.sendMessage(ChatColor.RED + "You must first define an area in WorldEdit.");
+            } catch (IOException e) {
+                player.sendMessage(ChatColor.RED + "Region database failed to save: "
+                        + e.getMessage());
+            }
+        } else if (action.equalsIgnoreCase("claim")) {
+            if (!canUseRegionCommand(player, "/regionclaim")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regionclaim permission.");
+                return;
+            }
+            
+            if (args.length < 1) {
+                player.sendMessage(ChatColor.RED + "/region claim <id>");
+                return;
+            }
+            
+            try {
+                String id = args[1].toLowerCase();
+                Plugin wePlugin = plugin.getServer().getPluginManager().getPlugin("WorldEdit");
+                if (plugin == null) {
+                    player.sendMessage(ChatColor.RED + "WorldEdit must be installed and enabled as a plugin.");
+                    return;
+                }
+
+                ProtectedRegion existing = plugin.regionManager.getRegion(id);
+                
+                if (existing != null) {
+                    if (!existing.getOwners().contains(plugin.wrapPlayer(player))) {
+                        player.sendMessage(ChatColor.RED + "You don't own this region.");
+                        return;
+                    }
+                }
+                
+                WorldEditPlugin worldEdit = (WorldEditPlugin)wePlugin;
+                WorldEditAPI api = worldEdit.getAPI();
+                
+                LocalSession session = api.getSession(player);
+                Region weRegion = session.getRegion();
+                
+                BlockVector min = weRegion.getMinimumPoint().toBlockVector();
+                BlockVector max = weRegion.getMaximumPoint().toBlockVector();
+                
+                ProtectedRegion region = new ProtectedCuboidRegion(min, max);
+                
+                if (plugin.regionManager.overlapsUnownedRegion(region, plugin.wrapPlayer(player))) {
+                    player.sendMessage(ChatColor.RED + "This region overlaps with someone else's region.");
+                    return;
+                }
+                
+                region.getOwners().addPlayer(player.getName());
+                
+                plugin.regionManager.addRegion(id, region);
+                plugin.regionLoader.save(plugin.regionManager);
+                player.sendMessage(ChatColor.YELLOW + "Region saved as " + id + ".");
+            } catch (IncompleteRegionException e) {
+                player.sendMessage(ChatColor.RED + "You must first define an area in WorldEdit.");
+            } catch (IOException e) {
+                player.sendMessage(ChatColor.RED + "Region database failed to save: "
+                        + e.getMessage());
+            }
+        } else if (action.equalsIgnoreCase("flag")) {
+            if (!canUseRegionCommand(player, "/regiondefine")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
+                return;
+            }
+            
+            if (args.length < 4) {
+                player.sendMessage(ChatColor.RED + "/region flag <id> <lighter> <none|allow|deny>");
+                player.sendMessage(ChatColor.RED + "Other flags not supported in Bukkit at the moment.");
+                return;
+            }
+            
+            try {
+                String id = args[1].toLowerCase();
+                String flagStr = args[2];
+                String stateStr = args[3];
+                ProtectedRegion region = plugin.regionManager.getRegion(id);
+                
+                if (region == null) {
+                    player.sendMessage(ChatColor.RED + "Could not find a region by that ID.");
+                    return;
+                }
+                
+                AreaFlags.State state = null;
+    
+                if (stateStr.equalsIgnoreCase("allow")) {
+                    state = AreaFlags.State.ALLOW;
+                } else if (stateStr.equalsIgnoreCase("deny")) {
+                    state = AreaFlags.State.DENY;
+                } else if (stateStr.equalsIgnoreCase("none")) {
+                    state = AreaFlags.State.NONE;
+                } else {
+                    player.sendMessage(ChatColor.RED + "Acceptable states: allow, deny, none");
+                    return;
+                }
+                
+                AreaFlags flags = region.getFlags();
+                
+                /*if (flagStr.equalsIgnoreCase("build")) {
+                    flags.allowBuild = state;
+                } else if (flagStr.equalsIgnoreCase("pvp")) {
+                    flags.allowPvP = state;
+                } else if (flagStr.equalsIgnoreCase("tnt")) {
+                    flags.allowTNT = state;
+                } else*/ if (flagStr.equalsIgnoreCase("lighter")) {
+                    flags.allowLighter = state;
+                } else {
+                    player.sendMessage(ChatColor.RED + "Acceptable flags: build, pvp, tnt, lighter");
+                    return;
+                }
+                
+                plugin.regionLoader.save(plugin.regionManager);
+                player.sendMessage(ChatColor.YELLOW + "Region '" + id + "' updated.");
+            } catch (IOException e) {
+                player.sendMessage(ChatColor.RED + "Region database failed to save: "
+                        + e.getMessage());
+            }
+        } else if (action.equalsIgnoreCase("info")) {
+            if (!canUseRegionCommand(player, "/regioninfo")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regioninfo permission.");
+                return;
+            }
+            
+            if (args.length < 2) {
+                player.sendMessage(ChatColor.RED + "/region info <id>");
+                return;
+            }
+    
+            String id = args[1].toLowerCase();
+            if (!plugin.regionManager.hasRegion(id)) {
+                player.sendMessage(ChatColor.RED + "A region with ID '"
+                        + id + "' doesn't exist.");
+                return;
+            }
+    
+            ProtectedRegion region = plugin.regionManager.getRegion(id);
+            AreaFlags flags = region.getFlags();
+            DefaultDomain domain = region.getOwners();
+            
+            player.sendMessage(ChatColor.YELLOW + "Region ID: " + id);
+            player.sendMessage(ChatColor.GRAY + "Type: " + region.getClass().getCanonicalName());
+            player.sendMessage(ChatColor.BLUE + "Build: " + flags.allowBuild.name());
+            player.sendMessage(ChatColor.BLUE + "PvP: " + flags.allowPvP.name());
+            player.sendMessage(ChatColor.BLUE + "TNT: " + flags.allowTNT.name());
+            player.sendMessage(ChatColor.BLUE + "Lighter: " + flags.allowLighter.name());
+            player.sendMessage(ChatColor.LIGHT_PURPLE + "Players: " + domain.toPlayersString());
+            player.sendMessage(ChatColor.LIGHT_PURPLE + "Groups: " + domain.toGroupsString());
+        } else if (action.equalsIgnoreCase("addowner")) {
+            if (!canUseRegionCommand(player, "/regiondefine")
+                    && !canUseRegionCommand(player, "/regionclaim")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
+                return;
+            }
+            
+            if (args.length < 2) {
+                player.sendMessage(ChatColor.RED + "/region addowner <id>");
+                return;
+            }
+    
+            try {
+                String id = args[1].toLowerCase();
+                if (!plugin.regionManager.hasRegion(id)) {
+                    player.sendMessage(ChatColor.RED + "A region with ID '"
+                            + id + "' doesn't exist.");
+                    return;
+                }
+                
+                ProtectedRegion existing = plugin.regionManager.getRegion(id);
+                
+                if (!canUseRegionCommand(player, "/regiondefine")
+                        && !existing.getOwners().contains(plugin.wrapPlayer(player))) {
+                    player.sendMessage(ChatColor.RED + "You don't own this region.");
+                    return;
+                }
+                
+                addToDomain(existing.getOwners(), args, 2);
+                
+                plugin.regionLoader.save(plugin.regionManager);
+                player.sendMessage(ChatColor.YELLOW + "Region updated!");
+            } catch (IOException e) {
+                player.sendMessage(ChatColor.RED + "Region database failed to save: "
+                        + e.getMessage());
+            }
+        } else if (action.equalsIgnoreCase("removeowner")) {
+            if (!canUseRegionCommand(player, "/regiondefine")
+                    && !canUseRegionCommand(player, "/regionclaim")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
+                return;
+            }
+            
+            if (args.length < 2) {
+                player.sendMessage(ChatColor.RED + "/region removeowner <id>");
+                return;
+            }
+    
+            try {
+                String id = args[1].toLowerCase();
+                if (!plugin.regionManager.hasRegion(id)) {
+                    player.sendMessage(ChatColor.RED + "A region with ID '"
+                            + id + "' doesn't exist.");
+                    return;
+                }
+                
+                ProtectedRegion existing = plugin.regionManager.getRegion(id);
+                
+                if (!canUseRegionCommand(player, "/regiondefine")
+                        && !existing.getOwners().contains(plugin.wrapPlayer(player))) {
+                    player.sendMessage(ChatColor.RED + "You don't own this region.");
+                    return;
+                }
+                
+                removeFromDomain(existing.getOwners(), args, 2);
+                
+                plugin.regionLoader.save(plugin.regionManager);
+                player.sendMessage(ChatColor.YELLOW + "Region updated!");
+            } catch (IOException e) {
+                player.sendMessage(ChatColor.RED + "Region database failed to save: "
+                        + e.getMessage());
+            }
+        } else if (action.equalsIgnoreCase("list")) {
+            if (!canUseRegionCommand(player, "/regiondefine")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
+                return;
+            }
+            
+            int page = 0;
+            
+            if (args.length >= 2) {
+                try {
+                    page = Math.max(0, Integer.parseInt(args[1]) - 1);
+                } catch (NumberFormatException e) {
+                    page = 0;
+                }
+            }
+    
+            Map<String,ProtectedRegion> regions = plugin.regionManager.getRegions();
+            int size = regions.size();
+            int pages = (int)Math.ceil(size / (float)CMD_LIST_SIZE);
+            
+            String[] regionIDList = new String[size];
+            int index = 0;
+            for (String id : regions.keySet()) {
+                regionIDList[index] = id;
+                index++;
+            }
+            Arrays.sort(regionIDList);
+            
+            
+            player.sendMessage(ChatColor.RED + "Regions (page "
+                    + (page + 1) + " of " + pages + "):");
+            
+            if (page < pages) {
+                for (int i = page * CMD_LIST_SIZE; i < page * CMD_LIST_SIZE + CMD_LIST_SIZE; i++) {
+                    if (i >= size) break;
+                    player.sendMessage(ChatColor.YELLOW.toString() + (i + 1) + ". " + regionIDList[i]);
+                }
+            }
+        } else if (action.equalsIgnoreCase("delete")) {
+            if (!canUseRegionCommand(player, "/regiondelete")
+                    && !canUseRegionCommand(player, "/regionclaim")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regiondelete permission.");
+                return;
+            }
+            
+            if (args.length < 2) {
+                player.sendMessage(ChatColor.RED + "/region delete <id>");
+                return;
+            }
+    
+            try {
+                String id = args[1].toLowerCase();
+                if (!plugin.regionManager.hasRegion(id)) {
+                    player.sendMessage(ChatColor.RED + "A region with ID '"
+                            + id + "' doesn't exist.");
+                    return;
+                }
+
+                ProtectedRegion existing = plugin.regionManager.getRegion(id);
+                
+                if (!canUseRegionCommand(player, "/regiondelete")
+                        && !existing.getOwners().contains(plugin.wrapPlayer(player))) {
+                    player.sendMessage(ChatColor.RED + "You don't own this region.");
+                    return;
+                }
+                
+                plugin.regionManager.removeRegion(id);
+                plugin.regionLoader.save(plugin.regionManager);
+                player.sendMessage(ChatColor.YELLOW + "Region removed!");
+            } catch (IOException e) {
+                player.sendMessage(ChatColor.RED + "Region database failed to save: "
+                        + e.getMessage());
+            }
+        } else if (action.equalsIgnoreCase("save")) {
+            if (!canUseRegionCommand(player, "/regionsave")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regionsave permission.");
+                return;
+            }
+            
+            try {
+                plugin.regionLoader.save(plugin.regionManager);
+                player.sendMessage(ChatColor.YELLOW + "Region database saved to file!");
+            } catch (IOException e) {
+                player.sendMessage(ChatColor.RED + "Region database failed to save: "
+                        + e.getMessage());
+            }
+        } else if (action.equalsIgnoreCase("load")) {
+            if (!canUseRegionCommand(player, "/regionload")) {
+                player.sendMessage(ChatColor.RED + "You don't have the /regionload permission.");
+                return;
+            }
+            
+            try {
+                plugin.regionLoader.load(plugin.regionManager);
+                player.sendMessage(ChatColor.YELLOW + "Region database loaded from file!");
+            } catch (IOException e) {
+                player.sendMessage(ChatColor.RED + "Region database failed to load: "
+                        + e.getMessage());
+            }
+        } else {
+            player.sendMessage(ChatColor.RED + "/region <define|claim|flag|delete|info|addowner|removeowner|list|save|load> ...");
+        }
+    }
+    
+    /**
+     * Checks for the command or /region.
+     * 
+     * @param player
+     * @param cmd
+     * @return
+     */
+    private boolean canUseRegionCommand(Player player, String cmd) {
+        return plugin.hasPermission(player, "/region")
+                || plugin.hasPermission(player, cmd);
+    }
+    
+    /**
+     * Parse a group/player DefaultDomain specification for areas.
+     * 
+     * @param domain
+     * @param split
+     * @param startIndex
+     */
+    private static void addToDomain(DefaultDomain domain,
+            String[] split, int startIndex) {        
+        for (int i = startIndex; i < split.length; i++) {
+            String s = split[i];
+            Matcher m = groupPattern.matcher(s);
+            if (m.matches()) {
+                domain.addGroup(m.group(1));
+            } else {
+                domain.addPlayer(s);
+            }
+        }
+    }
+    
+    /**
+     * Parse a group/player DefaultDomain specification for areas.
+     * 
+     * @param domain
+     * @param split
+     * @param startIndex
+     */
+    private static void removeFromDomain(DefaultDomain domain,
+            String[] split, int startIndex) {        
+        for (int i = startIndex; i < split.length; i++) {
+            String s = split[i];
+            Matcher m = groupPattern.matcher(s);
+            if (m.matches()) {
+                domain.removeGroup(m.group(1));
+            } else {
+                domain.removePlayer(s);
+            }
+        }
+    }
+    
+    /**
+     * Parse a group/player DefaultDomain specification for areas.
+     * 
+     * @param split
+     * @param startIndex
+     * @return
+     */
+    private static DefaultDomain parseDomainString(String[] split, int startIndex) {
+        DefaultDomain domain = new DefaultDomain();
+        
+        for (int i = startIndex; i < split.length; i++) {
+            String s = split[i];
+            Matcher m = groupPattern.matcher(s);
+            if (m.matches()) {
+                domain.addGroup(m.group(1));
+            } else {
+                domain.addPlayer(s);
+            }
+        }
+        
+        return domain;
+    }
+}

src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java

@@ -0,0 +1,327 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.entity.Player;
+import org.bukkit.Server;
+import org.bukkit.event.Event.Priority;
+import org.bukkit.event.Event;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.PluginLoader;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.config.Configuration;
+import com.sk89q.bukkit.migration.ConfigurationPermissionsResolver;
+import com.sk89q.worldguard.blacklist.Blacklist;
+import com.sk89q.worldguard.blacklist.BlacklistLogger;
+import com.sk89q.worldguard.blacklist.loggers.*;
+import com.sk89q.worldguard.protection.*;
+
+/**
+ * Plugin for Bukkit.
+ * 
+ * @author sk89qs
+ */
+public class WorldGuardPlugin extends JavaPlugin {
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+    
+    private final WorldGuardPlayerListener playerListener =
+        new WorldGuardPlayerListener(this);
+    private final WorldGuardBlockListener blockListener =
+        new WorldGuardBlockListener(this);
+    private final WorldGuardEntityListener entityListener =
+        new WorldGuardEntityListener(this);
+    private final ConfigurationPermissionsResolver perms;
+    
+    Blacklist blacklist;
+
+    RegionManager regionManager = new FlatRegionManager();
+    ProtectionDatabase regionLoader;
+    
+    Set<String> invinciblePlayers = new HashSet<String>();
+    Set<String> amphibiousPlayers = new HashSet<String>();
+    boolean fireSpreadDisableToggle;
+    
+    // Configuration follows
+    
+    boolean enforceOneSession;
+    boolean itemDurability;
+
+    boolean classicWater;
+    boolean simulateSponge;
+    int spongeRadius;
+
+    boolean noPhysicsGravel;
+    boolean noPhysicsSand;
+    boolean allowPortalAnywhere;
+    Set<Integer> preventWaterDamage;
+
+    boolean blockTNT;
+    boolean blockLighter;
+
+    boolean disableFireSpread;
+    Set<Integer> disableFireSpreadBlocks;
+    boolean preventLavaFire;
+    Set<Integer> allowedLavaSpreadOver;
+    
+    boolean blockCreeperExplosions;
+
+    int loginProtection;
+    int spawnProtection;
+    boolean kickOnDeath;
+    boolean exactRespawn;
+    boolean teleportToHome;
+    
+    boolean disableFallDamage;
+    boolean disableLavaDamage;
+    boolean disableFireDamage;
+    boolean disableDrowningDamage;
+    boolean disableSuffocationDamage;
+    boolean teleportOnSuffocation;
+
+    boolean useRegions;
+    int regionWand = 287; 
+    
+    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.");
+        
+        folder.mkdirs();
+
+        regionLoader = new CSVDatabase(new File(folder, "regions.txt"));
+        perms = new ConfigurationPermissionsResolver(getConfiguration());
+        loadConfiguration();
+        postReload();
+        registerEvents();
+    }
+
+    public void onEnable() {
+    }
+
+    public void onDisable() {
+    }
+
+    private void registerEvents() {
+        registerEvent(Event.Type.BLOCK_DAMAGED, blockListener, Priority.Normal);
+        registerEvent(Event.Type.BLOCK_FLOW, blockListener, Priority.Normal);
+        registerEvent(Event.Type.BLOCK_IGNITE, blockListener, Priority.Normal);
+        registerEvent(Event.Type.BLOCK_PHYSICS, blockListener, Priority.Normal);
+        registerEvent(Event.Type.BLOCK_INTERACT, blockListener, Priority.Normal);
+        registerEvent(Event.Type.BLOCK_PLACED, blockListener, Priority.Normal);
+        registerEvent(Event.Type.BLOCK_RIGHTCLICKED, blockListener, Priority.Normal);
+
+        registerEvent(Event.Type.ENTITY_DAMAGEDBY_BLOCK, entityListener, Priority.Normal);
+        registerEvent(Event.Type.ENTITY_DAMAGEDBY_ENTITY, entityListener, Priority.Normal);
+
+        registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal);
+        registerEvent(Event.Type.PLAYER_ITEM, playerListener, Priority.Normal);
+        registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Normal);
+        registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Normal);
+        registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Normal);
+    }
+    
+    private void registerEvent(Event.Type type, Listener listener, Priority priority) {
+        getServer().getPluginManager().registerEvent(type, listener, priority, this);
+    }
+
+    /**
+     * Load the configuration
+     */
+    public void loadConfiguration() {
+        Configuration config = getConfiguration();
+        config.load();
+
+        enforceOneSession = config.getBoolean("protection.enforce-single-session", true);
+        itemDurability = config.getBoolean("protection.item-durability", true);
+        
+        classicWater = config.getBoolean("simulation.classic-water", false);
+        simulateSponge = config.getBoolean("simulation.sponge.enable", true);
+        spongeRadius = Math.max(1, config.getInt("simulation.sponge.radius", 3)) - 1;
+        
+        noPhysicsGravel = config.getBoolean("physics.no-physics-gravel", false);
+        noPhysicsSand = config.getBoolean("physics.no-physics-sand", false);
+        allowPortalAnywhere = config.getBoolean("physics.allow-portal-anywhere", false);
+        preventWaterDamage = new HashSet<Integer>(config.getIntList("physics.disable-water-damage-blocks", null));
+        
+        blockTNT = config.getBoolean("ignition.block-tnt", false);
+        blockLighter = config.getBoolean("ignition.block-lighter", false);
+        
+        preventLavaFire = config.getBoolean("fire.disable-lava-fire-spread", true);
+        disableFireSpread = config.getBoolean("fire.disable-all-fire-spread", false);
+        disableFireSpreadBlocks = new HashSet<Integer>(config.getIntList("fire.disable-fire-spread-blocks", null));
+        allowedLavaSpreadOver = new HashSet<Integer>(config.getIntList("fire.lava-spread-blocks", null));
+        
+        blockCreeperExplosions = config.getBoolean("mobs.block-creeper-explosions", false);
+        
+        loginProtection = config.getInt("spawn.login-protection", 3);
+        spawnProtection = config.getInt("spawn.spawn-protection", 0);
+        kickOnDeath = config.getBoolean("spawn.kick-on-death", false);
+        exactRespawn = config.getBoolean("spawn.exact-respawn", false);
+        teleportToHome = config.getBoolean("spawn.teleport-to-home-on-death", false);
+        
+        disableFallDamage = config.getBoolean("player-damage.disable-fall-damage", false);
+        disableLavaDamage = config.getBoolean("player-damage.disable-lava-damage", false);
+        disableFireDamage = config.getBoolean("player-damage.disable-fire-damage", false);
+        disableDrowningDamage = config.getBoolean("player-damage.disable-water-damage", false);
+        disableSuffocationDamage = config.getBoolean("player-damage.disable-suffocation-damage", false);
+        teleportOnSuffocation = config.getBoolean("player-damage.teleport-on-suffocation", false);
+        
+        useRegions = config.getBoolean("regions.enable", true);
+        regionWand = config.getInt("regions.wand", 287);
+
+        try {
+            regionLoader.load();
+            regionManager.setRegions(regionLoader.getRegions());
+        } catch (IOException e) {
+            logger.warning("WorldGuard: Failed to load regions: "
+                    + e.getMessage());
+        }
+        
+        // Console log configuration
+        boolean logConsole = config.getBoolean("blacklist.logging.console.enable", true);
+
+        // Database log configuration
+        boolean logDatabase = config.getBoolean("blacklist.logging.database.enable", false);
+        String dsn = config.getString("blacklist.logging.database.dsn", "jdbc:mysql://localhost:3306/minecraft");
+        String user = config.getString("blacklist.logging.database.user", "root");
+        String pass = config.getString("blacklist.logging.database.pass", "");
+        String table = config.getString("blacklist.logging.database.table", "blacklist_events");
+
+        // File log configuration
+        boolean logFile = config.getBoolean("blacklist.logging.file.enable", false);
+        String logFilePattern = config.getString("blacklist.logging.file.path", "worldguard/logs/%Y-%m-%d.log");
+        int logFileCacheSize = Math.max(1, config.getInt("blacklist.logging.file.open-files", 10));
+        
+        // Load the blacklist
+        try {
+            // If there was an existing blacklist, close loggers
+            if (blacklist != null) {
+                blacklist.getLogger().close();
+            }
+
+            // First load the blacklist data from worldguard-blacklist.txt
+            Blacklist blist = new BukkitBlacklist(this);
+            blist.load(new File(getDataFolder(), "blacklist.txt"));
+
+            // If the blacklist is empty, then set the field to null
+            // and save some resources
+            if (blist.isEmpty()) {
+                this.blacklist = null;
+            } else {
+                this.blacklist = blist;
+                logger.log(Level.INFO, "WorldGuard: Blacklist loaded.");
+
+                BlacklistLogger blacklistLogger = blist.getLogger();
+
+                if (logDatabase) {
+                    blacklistLogger.addHandler(new DatabaseLoggerHandler(dsn, user, pass, table));
+                }
+
+                if (logConsole) {
+                    blacklistLogger.addHandler(new ConsoleLoggerHandler());
+                }
+
+                if (logFile) {
+                    FileLoggerHandler handler =
+                            new FileLoggerHandler(logFilePattern, logFileCacheSize);
+                    blacklistLogger.addHandler(handler);
+                }
+            }
+        } catch (FileNotFoundException e) {
+            logger.log(Level.WARNING, "WorldGuard blacklist does not exist.");
+        } catch (IOException e) {
+            logger.log(Level.WARNING, "Could not load WorldGuard blacklist: "
+                    + e.getMessage());
+        }
+
+        // Print an overview of settings
+        if (config.getBoolean("summary-on-start", true)) {
+            logger.log(Level.INFO, enforceOneSession ? "WorldGuard: Single session is enforced."
+                    : "WorldGuard: Single session is NOT ENFORCED.");
+            logger.log(Level.INFO, blockTNT ? "WorldGuard: TNT ignition is blocked."
+                    : "WorldGuard: TNT ignition is PERMITTED.");
+            logger.log(Level.INFO, blockLighter ? "WorldGuard: Lighters are blocked."
+                    : "WorldGuard: Lighters are PERMITTED.");
+            logger.log(Level.INFO, preventLavaFire ? "WorldGuard: Lava fire is blocked."
+                    : "WorldGuard: Lava fire is PERMITTED.");
+            if (disableFireSpread) {
+                logger.log(Level.INFO, "WorldGuard: All fire spread is disabled.");
+            } else {
+                if (disableFireSpreadBlocks != null) {
+                    logger.log(Level.INFO, "WorldGuard: Fire spread is limited to "
+                            + disableFireSpreadBlocks.size() + " block types.");
+                } else {
+                    logger.log(Level.INFO, "WorldGuard: Fire spread is UNRESTRICTED.");
+                }
+            }
+        }
+        
+        // Temporary
+        perms.load();
+    }
+    
+    /**
+     * Populates various lists.
+     */
+    public void postReload() {
+        invinciblePlayers.clear();
+        amphibiousPlayers.clear();
+
+        try {
+            for (Player player : getServer().getOnlinePlayers()) {
+                if (inGroup(player, "wg-invincible")) {
+                    invinciblePlayers.add(player.getName());
+                }
+
+                if (inGroup(player, "wg-amphibious")) {
+                    amphibiousPlayers.add(player.getName());
+                }
+            }
+        } catch (NullPointerException e) { // Thrown if loaded too early
+        }
+    }
+    
+    boolean inGroup(Player player, String group) {
+        return perms.inGroup(player.getName(), group);
+    }
+    
+    boolean hasPermission(Player player, String perm) {
+        return perms.hasPermission(player.getName(), perm);
+    }
+    
+    List<String> getGroups(Player player) {
+        return new ArrayList<String>();
+    }
+
+    BukkitPlayer wrapPlayer(Player player) {
+        return new BukkitPlayer(this, player);
+    }
+}

src/com/sk89q/worldguard/domains/DefaultDomain.java

@@ -0,0 +1,108 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.domains;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class DefaultDomain implements Domain {
+    private Set<String> groups;
+    private Set<String> players;
+    
+    public DefaultDomain() {
+        this.groups = new LinkedHashSet<String>();
+        this.players = new HashSet<String>();
+    }
+    
+    public void addPlayer(String name) {
+        players.add(name.toLowerCase());
+    }
+    
+    public void addPlayer(LocalPlayer player) {
+        players.add(player.getName().toLowerCase());
+    }
+    
+    public void removePlayer(String name) {
+        players.remove(name.toLowerCase());
+    }
+    
+    public void removePlayer(LocalPlayer player) {
+        players.remove(player.getName().toLowerCase());
+    }
+    
+    public void addGroup(String name) {
+        groups.add(name.toLowerCase());
+    }
+    
+    public void removeGroup(String name) {
+        groups.remove(name.toLowerCase());
+    }
+    
+    public Set<String> getGroups() {
+        return groups;
+    }
+    
+    public Set<String> getPlayers() {
+        return players;
+    }
+
+    public boolean contains(LocalPlayer player) {
+        if (players.contains(player.getName().toLowerCase())) {
+            return true;
+        }
+        
+        for (String group : groups) {
+            if (player.hasGroup(group)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+    
+    public int size() {
+        return groups.size();
+    }
+    
+    public String toPlayersString() {
+        StringBuilder str = new StringBuilder();
+        for (Iterator<String> it = players.iterator(); it.hasNext(); ) {
+            str.append(it.next());
+            if (it.hasNext()) {
+                str.append(", ");
+            }
+        }
+        return str.toString();
+    }
+    
+    public String toGroupsString() {
+        StringBuilder str = new StringBuilder();
+        for (Iterator<String> it = groups.iterator(); it.hasNext(); ) {
+            str.append(it.next());
+            if (it.hasNext()) {
+                str.append(", ");
+            }
+        }
+        return str.toString();
+    }
+}

src/com/sk89q/worldguard/domains/Domain.java

@@ -0,0 +1,13 @@
+package com.sk89q.worldguard.domains;
+
+import com.sk89q.worldguard.LocalPlayer;
+
+public interface Domain {
+    /**
+     * Returns true if a domain contains a player.
+     * 
+     * @param player
+     * @return
+     */
+    public boolean contains(LocalPlayer player);
+}

src/com/sk89q/worldguard/domains/DomainCollection.java

@@ -0,0 +1,55 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.domains;
+
+import java.util.Set;
+import java.util.LinkedHashSet;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class DomainCollection implements Domain {
+    private Set<Domain> domains;
+    
+    public DomainCollection() {
+        domains = new LinkedHashSet<Domain>();
+    }
+    
+    public void add(Domain domain) {
+        domains.add(domain);
+    }
+    
+    public void remove(Domain domain) {
+        domains.remove(domain);
+    }
+    
+    public int size() {
+        return domains.size();
+    }
+
+    public boolean contains(LocalPlayer player) {
+        for (Domain domain : domains) {
+            if (domain.contains(player)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+}

src/com/sk89q/worldguard/domains/GroupDomain.java

@@ -0,0 +1,56 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.domains;
+
+import java.util.Arrays;
+import java.util.Set;
+import java.util.LinkedHashSet;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class GroupDomain implements Domain {
+    private Set<String> groups;
+    
+    public GroupDomain() {
+        this.groups = new LinkedHashSet<String>();
+    }
+    
+    public GroupDomain(String[] groups) {
+        this.groups = new LinkedHashSet<String>(Arrays.asList(groups));
+    }
+    
+    public void addGroup(String name) {
+        groups.add(name);
+    }
+
+    public boolean contains(LocalPlayer player) {
+        for (String group : groups) {
+            if (player.hasGroup(group)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+    
+    public int size() {
+        return groups.size();
+    }
+
+}

src/com/sk89q/worldguard/domains/PlayerDomain.java

@@ -0,0 +1,53 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.domains;
+
+import java.util.Set;
+import java.util.HashSet;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class PlayerDomain implements Domain {
+    private Set<String> players;
+    
+    public PlayerDomain() {
+        this.players = new HashSet<String>();
+    }
+    
+    public PlayerDomain(String[] players) {
+        this.players = new HashSet<String>();
+        
+        for (String name : players) {
+            this.players.add(name.toLowerCase());
+        }
+    }
+    
+    public void addPlayer(String name) {
+        players.add(name.toLowerCase());
+    }
+    
+    public boolean contains(LocalPlayer player) {
+        return players.contains(player.getName().toLowerCase());
+    }
+    
+    public int size() {
+        return players.size();
+    }
+
+}

src/com/sk89q/worldguard/protection/ApplicableRegionSet.java

@@ -0,0 +1,125 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import java.util.Map;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.protection.AreaFlags.State;
+
+/**
+ * Represents a set of regions and their rules as applied to one point.
+ * 
+ * @author sk89q
+ */
+public class ApplicableRegionSet {
+    private Vector pt;
+    private Map<String,ProtectedRegion> regions;
+    
+    public ApplicableRegionSet(Vector pt, Map<String,ProtectedRegion> regions) {
+        this.pt = pt;
+        this.regions = regions;
+    }
+    
+    public boolean canBuild(LocalPlayer player) {
+        boolean allowed = false;
+        boolean found = false;
+        
+        for (ProtectedRegion region : regions.values()) {
+            if (!region.contains(pt)) continue;
+            if (region.getFlags().allowBuild == State.DENY) return false;
+            
+            found = true;
+
+            if (!allowed && region.getFlags().allowBuild == State.ALLOW) {
+                allowed = true;
+            }
+            
+            if (!allowed && region.getOwners().contains(player)) {
+                allowed = true;
+            }
+        }
+        
+        return found ? allowed : true;
+    }
+    
+    public boolean allowsPvP() {
+        for (ProtectedRegion region : regions.values()) {
+            if (!region.contains(pt)) continue;
+            if (region.getFlags().allowBuild == State.DENY) return false;
+        }
+        
+        return true;
+    }
+    
+    public boolean allowsMobDamage() {
+        for (ProtectedRegion region : regions.values()) {
+            if (!region.contains(pt)) continue;
+            if (region.getFlags().allowMobDamage == State.DENY) return false;
+        }
+        
+        return true;
+    }
+    
+    public boolean allowsCreeperExplosions() {
+        for (ProtectedRegion region : regions.values()) {
+            if (!region.contains(pt)) continue;
+            if (region.getFlags().allowCreeperExplosions == State.DENY) return false;
+        }
+        
+        return true;
+    }
+    
+    public boolean allowsTNT() {
+        for (ProtectedRegion region : regions.values()) {
+            if (!region.contains(pt)) continue;
+            if (region.getFlags().allowTNT == State.DENY) return false;
+        }
+        
+        return true;
+    }
+    
+    public boolean allowsLighter() {
+        for (ProtectedRegion region : regions.values()) {
+            if (!region.contains(pt)) continue;
+            if (region.getFlags().allowLighter == State.DENY) return false;
+        }
+        
+        return true;
+    }
+    
+    public boolean allowsFireSpread() {
+        for (ProtectedRegion region : regions.values()) {
+            if (!region.contains(pt)) continue;
+            if (region.getFlags().allowFireSpread == State.DENY) return false;
+        }
+        
+        return true;
+    }
+    
+    public boolean allowsLavaFire() {
+        for (ProtectedRegion region : regions.values()) {
+            if (!region.contains(pt)) continue;
+            if (region.getFlags().allowLavaFire == State.DENY) return false;
+        }
+        
+        return true;
+    }
+}

src/com/sk89q/worldguard/protection/AreaFlags.java

@@ -0,0 +1,59 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+/**
+ * 
+ * @author sk89q
+ */
+public class AreaFlags {
+    public enum State {
+        NONE,
+        ALLOW,
+        DENY,
+    };
+
+    public State allowBuild = State.NONE;
+    public State allowPvP = State.NONE;
+    public State allowMobDamage = State.NONE;
+    public State allowCreeperExplosions = State.NONE;
+    public State allowTNT = State.NONE;
+    public State allowLighter = State.NONE;
+    public State allowFireSpread = State.NONE;
+    public State allowLavaFire = State.NONE;
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof AreaFlags)) {
+            return false;
+        }
+        
+        AreaFlags other = (AreaFlags)obj;
+        
+        return other.allowBuild == allowBuild
+                && other.allowPvP == allowPvP
+                && other.allowMobDamage == allowMobDamage
+                && other.allowCreeperExplosions == allowCreeperExplosions
+                && other.allowTNT == allowTNT
+                && other.allowLighter == allowLighter
+                && other.allowFireSpread == allowFireSpread
+                && other.allowLavaFire == allowLavaFire;
+    }
+}

src/com/sk89q/worldguard/protection/CSVDatabase.java

@@ -0,0 +1,333 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.io.*;
+
+import au.com.bytecode.opencsv.CSVReader;
+import au.com.bytecode.opencsv.CSVWriter;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.AreaFlags.State;
+
+/**
+ * Represents a protected area database that uses CSV files.
+ * 
+ * @author sk89q
+ */
+public class CSVDatabase implements ProtectionDatabase {
+    private static Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+    
+    /**
+     * References the CSV file.
+     */
+    private File file;
+    /**
+     * Holds the list of regions.
+     */
+    private Map<String,ProtectedRegion> regions;
+    
+    /**
+     * Construct the database with a path to a file. No file is read or
+     * written at this time.
+     * 
+     * @param file
+     */
+    public CSVDatabase(File file) {
+        this.file = file;
+    }
+
+    /**
+     * Saves the database.
+     */
+    @Override
+    public void save() throws IOException {
+        CSVWriter writer = new CSVWriter(new FileWriter(file));
+        
+        try {
+            for (Map.Entry<String,ProtectedRegion> entry : regions.entrySet()) {
+                String id = entry.getKey();
+                ProtectedRegion region = entry.getValue();
+                
+                if (!(region instanceof ProtectedCuboidRegion)) {
+                    logger.warning("The CSV database only supports cuboid regions.");
+                    continue;
+                }
+                
+                ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion)region;
+                BlockVector min = cuboid.getMinimumPoint();
+                BlockVector max = cuboid.getMaximumPoint();
+                
+                writer.writeNext(new String[] {
+                        id,
+                        "cuboid",
+                        String.valueOf(min.getBlockX()),
+                        String.valueOf(min.getBlockY()),
+                        String.valueOf(min.getBlockZ()),
+                        String.valueOf(max.getBlockX()),
+                        String.valueOf(max.getBlockY()),
+                        String.valueOf(max.getBlockZ()),
+                        String.valueOf(cuboid.getPriority()),
+                        writeDomains(cuboid.getOwners()),
+                        writeFlags(cuboid.getFlags()),
+                        cuboid.getEnterMessage(),
+                        });
+            }
+        } finally {
+            try {
+                writer.close();
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    /**
+     * Load the database from file.
+     */
+    @Override
+    public void load() throws IOException {
+        Map<String,ProtectedRegion> regions =
+                new HashMap<String,ProtectedRegion>();
+        
+        CSVReader reader = new CSVReader(new FileReader(file));
+        
+        try {
+            String[] line;
+            
+            while ((line = reader.readNext()) != null) {
+                if (line.length >= 12) {
+                    String type = line[1];
+                    if (!type.equalsIgnoreCase("cuboid")) {
+                        logger.warning("Only cuboid region types are supported: "
+                                + line);
+                        break;
+                        
+                    }
+                    
+                    String id = line[0];
+                    BlockVector min = new BlockVector(
+                            Integer.parseInt(line[2]),
+                            Integer.parseInt(line[3]),
+                            Integer.parseInt(line[4]));
+                    BlockVector max = new BlockVector(
+                            Integer.parseInt(line[5]),
+                            Integer.parseInt(line[6]),
+                            Integer.parseInt(line[7]));
+                    int priority = Integer.parseInt(line[8]);
+                    String ownersData = line[9];
+                    String flagsData = line[10];
+                    String enterMessage = line[11];
+                    
+                    ProtectedRegion region = new ProtectedCuboidRegion(min, max);
+                    region.setPriority(priority);
+                    region.setOwners(this.parseDomains(ownersData));
+                    region.setEnterMessage(enterMessage);
+                    region.setFlags(parseFlags(flagsData));
+                    regions.put(id, region);
+                } else {
+                    logger.warning("Line has invalid: " + line);
+                }
+            }
+        } finally {
+            try {
+                reader.close();
+            } catch (IOException e) {
+            }
+        }
+        
+        this.regions = regions;
+    }
+
+    /**
+     * Load the list of regions into a region manager.
+     * 
+     * @throws IOException
+     */
+    public void load(RegionManager manager) throws IOException {
+        load();
+        manager.setRegions(regions);
+    }
+    
+    /**
+     * Save the list of regions from a region manager.
+     * 
+     * @throws IOException
+     */
+    public void save(RegionManager manager) throws IOException {
+        regions = manager.getRegions();
+        save();
+    }
+    
+    /**
+     * Used to parse the specified domain in the CSV file.
+     * 
+     * @param data
+     * @return
+     */
+    private DefaultDomain parseDomains(String data) {
+        DefaultDomain domain = new DefaultDomain();
+        Pattern pattern = Pattern.compile("^([A-Za-z]):(.*)$");
+        
+        String[] parts = data.split(",");
+        
+        for (String part : parts) {
+            Matcher matcher = pattern.matcher(part);
+            
+            if (!matcher.matches()) {
+                logger.warning("Invalid owner specification: " + part);
+                continue;
+            }
+
+            String type = matcher.group(1);
+            String id = matcher.group(2);
+
+            if (type.equals("u")) {
+                domain.addPlayer(id);
+            } else if (type.equals("g")) {
+                domain.addGroup(id);
+            } else {
+                logger.warning("Unknown owner specification: " + type);
+            }
+        }
+        
+        return domain;
+    }
+    
+    /**
+     * Used to parse the list of flags.
+     * 
+     * @param data
+     * @return
+     */
+    private AreaFlags parseFlags(String data) {
+        AreaFlags flags = new AreaFlags();
+        State curState = State.ALLOW;
+        
+        for (int i = 0; i < data.length(); i++) {
+            char flag = data.charAt(i);
+            if (flag == '+') {
+                curState = State.ALLOW;
+            } else if (flag == '-') {
+                curState = State.DENY;
+            } else if (flag == 'b') {
+                flags.allowBuild = curState;
+            } else if (flag == 'p') {
+                flags.allowPvP = curState;
+            } else if (flag == 'm') {
+                flags.allowMobDamage = curState;
+            } else if (flag == 'c') {
+                flags.allowCreeperExplosions = curState;
+            } else if (flag == 't') {
+                flags.allowTNT = curState;
+            } else if (flag == 'l') {
+                flags.allowLighter = curState;
+            } else if (flag == 'f') {
+                flags.allowFireSpread = curState;
+            } else if (flag == 'F') {
+                flags.allowLavaFire = curState;
+            } else {
+                logger.warning("Unknown area flag/flag modifier: " + flag);
+            }
+        }
+        
+        return flags;
+    }
+    
+    /**
+     * Used to write the list of domains.
+     * 
+     * @param domain
+     * @return
+     */
+    private String writeDomains(DefaultDomain domain) {
+        StringBuilder str = new StringBuilder();
+        
+        for (String player : domain.getPlayers()) {
+            str.append("u:" + player + ",");
+        }
+        
+        for (String group : domain.getGroups()) {
+            str.append("g:" + group + ",");
+        }
+        
+        return str.length() > 0 ?
+                str.toString().substring(0, str.length() - 1) : "";
+    }
+    
+    /**
+     * Helper method to prepend '+' or '-' in front of a flag according
+     * to the flag's state.
+     * 
+     * @param state
+     * @param flag
+     * @return
+     */
+    private String writeFlag(State state, String flag) {
+        if (state == State.ALLOW) {
+            return "+" + flag;
+        } else if (state == State.DENY) {
+            return "-" + flag;
+        }
+        
+        return "";
+    }
+    
+    /**
+     * Used to write the list of flags.
+     * 
+     * @param flags
+     * @return
+     */
+    private String writeFlags(AreaFlags flags) {
+        StringBuilder str = new StringBuilder();
+        str.append(writeFlag(flags.allowBuild, "b"));
+        str.append(writeFlag(flags.allowPvP, "p"));
+        str.append(writeFlag(flags.allowMobDamage, "m"));
+        str.append(writeFlag(flags.allowCreeperExplosions, "c"));
+        str.append(writeFlag(flags.allowTNT, "t"));
+        str.append(writeFlag(flags.allowLighter, "l"));
+        str.append(writeFlag(flags.allowFireSpread, "f"));
+        str.append(writeFlag(flags.allowLavaFire, "F"));
+        return str.toString();
+    }
+
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    public Map<String,ProtectedRegion> getRegions() {
+        return regions;
+    }
+
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions) {
+        this.regions = regions;
+    }
+}

src/com/sk89q/worldguard/protection/CacheManager.java

@@ -0,0 +1,41 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+/**
+ * Caches the results of the protection to prevent necessary lookups.
+ * 
+ * @author sk89q
+ */
+public class CacheManager {
+    /**
+     * Region manager.
+     */
+    private RegionManager manager;
+    
+    /**
+     * Construct the object.
+     * 
+     * @param manager
+     */
+    public CacheManager(RegionManager manager) {
+        this.manager = manager;
+    }
+}

src/com/sk89q/worldguard/protection/FlatRegionManager.java

@@ -0,0 +1,167 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.LinkedHashMap;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+/**
+ * A very simple implementation of the region manager that uses a flat list
+ * and iterates through the list to identify applicable regions. This method
+ * is not very efficient.
+ * 
+ * @author sk89q
+ */
+public class FlatRegionManager implements RegionManager {
+    /**
+     * List of protected regions.
+     */
+    private Map<String,ProtectedRegion> regions;
+    
+    /**
+     * Construct the manager.
+     */
+    public FlatRegionManager() {
+        regions = new LinkedHashMap<String,ProtectedRegion>();
+    }
+    
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    public Map<String,ProtectedRegion> getRegions() {
+        return regions;
+    }
+    
+    /**
+     * Adds a region.
+     * 
+     * @param id
+     * @param region
+     */
+    public void addRegion(String id, ProtectedRegion region) {
+        regions.put(id, region);
+    }
+    
+    /**
+     * Removes a region.
+     * 
+     * @param id
+     */
+    public void removeRegion(String id) {
+        regions.remove(id);
+    }
+    
+    /**
+     * Return whether a region exists by an ID.
+     * 
+     * @param id
+     * @return
+     */
+    public boolean hasRegion(String id) {
+        return regions.containsKey(id);
+    }
+    
+    /**
+     * Get a region by its ID.
+     * 
+     * @param id
+     */
+    public ProtectedRegion getRegion(String id) {
+        return regions.get(id);
+    }
+    
+    /**
+     * Set a list of protected regions.
+     *
+     * @return
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions) {
+        this.regions = regions;
+    }
+    
+    /**
+     * Get an object for a point for rules to be applied with.
+     * 
+     * @param pt
+     * @return
+     */
+    public ApplicableRegionSet getApplicableRegions(Vector pt) {
+        return new ApplicableRegionSet(pt, regions);
+    }
+    
+    /**
+     * Get a list of region IDs that contain a point.
+     * 
+     * @param pt
+     * @return
+     */
+    public List<String> getApplicableRegionsIDs(Vector pt) {
+        List<String> applicable = new ArrayList<String>();
+        
+        for (Map.Entry<String,ProtectedRegion> entry : regions.entrySet()) {
+            if (entry.getValue().contains(pt)) {
+                applicable.add(entry.getKey());
+            }
+        }
+        
+        return applicable;
+    }
+    
+    /**
+     * Returns true if the provided region overlaps with any other region that
+     * is not owned by the player.
+     * 
+     * @param region
+     * @param player
+     * @return
+     */
+    public boolean overlapsUnownedRegion(ProtectedRegion region, LocalPlayer player) {
+        for (ProtectedRegion other : regions.values()) {
+            if (other.getOwners().contains(player)) {
+                continue;
+            }
+            
+            try {
+                if (ProtectedRegion.intersects(region, other)) {
+                    return true;
+                }
+            } catch (UnsupportedIntersectionException e) {
+                // TODO: Maybe do something here
+            }
+        }
+        
+        return false;
+    }
+    
+    /**
+     * Get the number of regions.
+     * 
+     * @return
+     */
+    public int size() {
+        return regions.size();
+    }
+}

src/com/sk89q/worldguard/protection/ProtectedCuboidRegion.java

@@ -0,0 +1,97 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import com.sk89q.worldedit.*;
+
+/**
+ * Represents a cuboid region that can be protected.
+ *
+ * @author sk89q
+ */
+public class ProtectedCuboidRegion extends ProtectedRegion {
+    /**
+     * Store the first point.
+     */
+    private BlockVector min;
+    /**
+     * Store the second point.
+     */
+    private BlockVector max;
+
+    /**
+     * Construct a new instance of this cuboid region.
+     *
+     * @param pos1
+     * @param pos2
+     * @param priority
+     */
+    public ProtectedCuboidRegion(BlockVector min, BlockVector max) {
+        super();
+        this.min = min;
+        this.max = max;
+    }
+
+    /**
+     * Get the lower point of the cuboid.
+     *
+     * @return min point
+     */
+    public BlockVector getMinimumPoint() {
+        return min;
+    }
+
+    /**
+     * Set the lower point of the cuboid.
+     *
+     * @param pt
+     */
+    public void setMinimumPoint(BlockVector pt) {
+        min = pt;
+    }
+
+    /**
+     * Get the upper point of the cuboid.
+     *
+     * @return max point
+     */
+    public BlockVector getMaximumPoint() {
+        return max;
+    }
+
+    /**
+     * Set the upper point of the cuboid.
+     *
+     * @param pt
+     */
+    public void setMaximumPoint(BlockVector pt) {
+        max = pt;
+    }
+
+    @Override
+    public boolean contains(Vector pt) {
+        int x = pt.getBlockX();
+        int y = pt.getBlockY();
+        int z = pt.getBlockZ();
+        return x >= min.getBlockX() && x <= max.getBlockX()
+                && y >= min.getBlockY() && y <= max.getBlockY()
+                && z >= min.getBlockZ() && z <= max.getBlockZ();
+    }
+}

src/com/sk89q/worldguard/protection/ProtectedRegion.java

@@ -0,0 +1,159 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.domains.DefaultDomain;
+
+/**
+ * Represents a region of any shape and size that can be protected.
+ * 
+ * @author sk89q
+ */
+public abstract class ProtectedRegion {
+    /**
+     * Area message.
+     */
+    private String enterMessage;
+    /**
+     * List of owners.
+     */
+    private DefaultDomain owners = new DefaultDomain();
+    /**
+     * Priority.
+     */
+    private int priority = 0;
+    /**
+     * Area flags.
+     */
+    private AreaFlags flags = new AreaFlags();
+
+    /**
+     * Construct a new instance of this cuboid region.
+     *
+     * @param id
+     * @param priority
+     * @param owners
+     * @param enterMessage
+     */
+    public ProtectedRegion() {
+        this.priority = 0;
+        this.owners = new DefaultDomain();
+        this.enterMessage = null;
+    }
+
+    /**
+     * @return the priority
+     */
+    public int getPriority() {
+        return priority;
+    }
+
+    /**
+     * @param priority the priority to set
+     */
+    public void setPriority(int priority) {
+        this.priority = priority;
+    }
+    
+    /**
+     * Se flags.
+     * @param flags
+     */
+    public void setFlags(AreaFlags flags) {
+        this.flags = flags;
+    }
+    
+    /**
+     * @return the enterMessage
+     */
+    public String getEnterMessage() {
+        return enterMessage;
+    }
+
+    /**
+     * @param enterMessage the enterMessage to set
+     */
+    public void setEnterMessage(String enterMessage) {
+        this.enterMessage = enterMessage;
+    }
+
+    /**
+     * @return the owners
+     */
+    public DefaultDomain getOwners() {
+        return owners;
+    }
+
+    /**
+     * @param owners the owners to set
+     */
+    public void setOwners(DefaultDomain owners) {
+        this.owners = owners;
+    }
+
+    /**
+     * Get flags.
+     * 
+     * @return
+     */
+    public AreaFlags getFlags() {
+        return flags;
+    }
+    
+    /**
+     * Check to see if a point is inside this region.
+     * 
+     * @param pt
+     * @return
+     */
+    public abstract boolean contains(Vector pt);
+    
+    /**
+     * Checks if two region intersects.
+     * 
+     * @param region1
+     * @param region2
+     * @throws UnsupportedIntersectionException
+     * @return
+     */
+    public static boolean intersects(ProtectedRegion region1, ProtectedRegion region2)
+            throws UnsupportedIntersectionException {
+        if (region1 instanceof ProtectedCuboidRegion
+                && region2 instanceof ProtectedCuboidRegion) {
+            ProtectedCuboidRegion r1 = (ProtectedCuboidRegion)region1;
+            ProtectedCuboidRegion r2 = (ProtectedCuboidRegion)region2;
+            BlockVector min1 = r1.getMinimumPoint();
+            BlockVector max1 = r1.getMaximumPoint();
+            BlockVector min2 = r2.getMinimumPoint();
+            BlockVector max2 = r2.getMaximumPoint(); 
+            
+            return !(min1.getBlockX() > max2.getBlockX()
+                    || min1.getBlockY() > max2.getBlockY()
+                    || min1.getBlockZ() > max2.getBlockZ()
+                    || max1.getBlockX() < min2.getBlockX()
+                    || max1.getBlockY() < min2.getBlockY()
+                    || max1.getBlockZ() < min2.getBlockZ());
+        } else {
+            throw new UnsupportedIntersectionException();
+        }
+    }
+}

src/com/sk89q/worldguard/protection/ProtectionDatabase.java

@@ -0,0 +1,68 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Represents a database to read and write lists of regions from and to.
+ * 
+ * @author sk89q
+ */
+public interface ProtectionDatabase {
+    /**
+     * Load the list of regions. The method should not modify the list returned
+     * by getRegions() unless the load finishes successfully.
+     * 
+     * @throws IOException
+     */
+    public void load() throws IOException;
+    /**
+     * Save the list of regions.
+     * 
+     * @throws IOException
+     */
+    public void save() throws IOException;
+    /**
+     * Load the list of regions into a region manager.
+     * 
+     * @throws IOException
+     */
+    public void load(RegionManager manager) throws IOException;
+    /**
+     * Save the list of regions from a region manager.
+     * 
+     * @throws IOException
+     */
+    public void save(RegionManager manager) throws IOException;
+    /**
+     * Get a list of regions.
+     * 
+     * @return
+     */
+    public Map<String,ProtectedRegion> getRegions();
+    /**
+     * Set the list of regions.
+     * 
+     * @param regions
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions);
+}

src/com/sk89q/worldguard/protection/RegionManager.java

@@ -0,0 +1,112 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import java.util.List;
+import java.util.Map;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+/**
+ * An interface for getting, setting, and looking up regions. The most
+ * simple implementation uses a flat list and iterates through the entire
+ * list to look for applicable regions, but a more complicated (and more
+ * efficient) implementation may use space partitioning techniques.
+ *
+ * @author sk89q
+ */
+public interface RegionManager {
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    public Map<String,ProtectedRegion> getRegions();
+    
+    /**
+     * Set a list of protected regions.
+     *
+     * @return
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions);
+    
+    /**
+     * Adds a region.
+     * 
+     * @param id
+     * @param region
+     */
+    public void addRegion(String id, ProtectedRegion region);
+    
+    /**
+     * Return whether a region exists by an ID.
+     * 
+     * @param id
+     * @return
+     */
+    public boolean hasRegion(String id);
+    
+    /**
+     * Get a region by its ID.
+     * 
+     * @param id
+     */
+    public ProtectedRegion getRegion(String id);
+    
+    /**
+     * Removes a region.
+     * 
+     * @param id
+     */
+    public void removeRegion(String id);
+
+    /**
+     * Get an object for a point for rules to be applied with.
+     * 
+     * @param pt
+     * @return
+     */
+    public ApplicableRegionSet getApplicableRegions(Vector pt);
+    
+    /**
+     * Get a list of region IDs that contain a point.
+     * 
+     * @param pt
+     * @return
+     */
+    public List<String> getApplicableRegionsIDs(Vector pt);
+    
+    /**
+     * Returns true if the provided region overlaps with any other region that
+     * is not owned by the player.
+     * 
+     * @param region
+     * @param player
+     * @return
+     */
+    public boolean overlapsUnownedRegion(ProtectedRegion region, LocalPlayer player);
+    
+    /**
+     * Get the number of regions.
+     * 
+     * @return
+     */
+    public int size();
+}

src/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java

@@ -0,0 +1,24 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+public class UnsupportedIntersectionException extends Exception {
+    private static final long serialVersionUID = 6423189392345575148L;
+}

tests/com/sk89q/worldguard/TestPlayer.java

@@ -1,47 +1,47 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-import java.util.logging.Level;
-
-/**
- * Used for formatting.
- *
- * @author sk89q
- */
-public class SimpleLogFormat extends Formatter {
-    private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    public String format(LogRecord record) {
-        StringBuilder text = new StringBuilder();
-        Level level = record.getLevel();
-
-        text.append("[");
-        text.append(dateFormat.format(new Date(record.getMillis())));
-        text.append("] ");
-        text.append(record.getMessage());
-        text.append("\r\n");
-        
-        return text.toString();
-    }
-}
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard;
+
+import java.util.Set;
+import java.util.HashSet;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class TestPlayer extends LocalPlayer {
+    private String name;
+    private Set<String> groups = new HashSet<String>();
+    
+    public TestPlayer(String name) {
+        this.name = name;
+    }
+    
+    public void addGroup(String group) {
+        groups.add(group.toLowerCase());
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean hasGroup(String group) {
+        return groups.contains(group.toLowerCase());
+    }
+}

tests/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java

@@ -0,0 +1,130 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.TestPlayer;
+import com.sk89q.worldguard.domains.DefaultDomain;
+
+public class ApplicableRegionSetTest {
+    static String COURTYARD_ID = "courtyard";
+    static String FOUNTAIN_ID = "fountain";
+    static String MEMBER_GROUP = "member";
+    static String COURTYARD_GROUP = "courtyard";
+
+    Vector inFountain = new Vector(2, 2, 2);
+    Vector inCourtyard = new Vector(7, 7, 7);
+    Vector outside = new Vector(15, 15, 15);
+    RegionManager manager;
+    TestPlayer player1;
+    TestPlayer player2;
+
+    @Before
+    public void setUp() throws Exception {
+        manager = new FlatRegionManager();
+
+        setUpPlayers();
+        setUpCourtyardRegion();
+        setUpFountainRegion();
+    }
+    
+    void setUpPlayers() {
+        player1 = new TestPlayer("tetsu");
+        player1.addGroup(MEMBER_GROUP);
+        player1.addGroup(COURTYARD_GROUP);
+
+        player2 = new TestPlayer("alex");
+        player2.addGroup(MEMBER_GROUP);
+    }
+    
+    void setUpCourtyardRegion() {
+        DefaultDomain domain = new DefaultDomain();
+        domain.addGroup(COURTYARD_GROUP);
+        
+        ProtectedRegion region = new ProtectedCuboidRegion(
+                new BlockVector(0, 0, 0), new BlockVector(10, 10, 10));
+        AreaFlags flags = new AreaFlags();
+        flags.allowBuild = AreaFlags.State.NONE;
+        flags.allowFireSpread = AreaFlags.State.ALLOW;
+        region.setFlags(flags);
+        region.setOwners(domain);
+        manager.addRegion(COURTYARD_ID, region);
+    }
+    
+    void setUpFountainRegion() {
+        ProtectedRegion region = new ProtectedCuboidRegion(
+                new BlockVector(0, 0, 0), new BlockVector(5, 5, 5));
+        AreaFlags flags = new AreaFlags();
+        flags.allowBuild = AreaFlags.State.ALLOW;
+        flags.allowFireSpread = AreaFlags.State.DENY;
+        region.setFlags(flags);
+        manager.addRegion(FOUNTAIN_ID, region);
+    }
+    
+    @Test
+    public void testNonBuildFlag() {        
+        ApplicableRegionSet appl;
+        
+        // Outside
+        appl = manager.getApplicableRegions(outside);
+        assertTrue(appl.allowsFireSpread());
+        // Inside courtyard
+        appl = manager.getApplicableRegions(inCourtyard);
+        assertTrue(appl.allowsFireSpread());
+        // Inside fountain
+        appl = manager.getApplicableRegions(inFountain);
+        assertFalse(appl.allowsFireSpread());
+    }
+    
+    @Test
+    public void testPlayer1BuildAccess() {        
+        ApplicableRegionSet appl;
+        
+        // Outside
+        appl = manager.getApplicableRegions(outside);
+        assertTrue(appl.canBuild(player1));
+        // Inside courtyard
+        appl = manager.getApplicableRegions(inCourtyard);
+        assertTrue(appl.canBuild(player1));
+        // Inside fountain
+        appl = manager.getApplicableRegions(inFountain);
+        assertTrue(appl.canBuild(player1));
+    }
+    
+    @Test
+    public void testPlayer2BuildAccess() {        
+        ApplicableRegionSet appl;
+        
+        // Outside
+        appl = manager.getApplicableRegions(outside);
+        assertTrue(appl.canBuild(player2));
+        // Inside courtyard
+        appl = manager.getApplicableRegions(inCourtyard);
+        assertFalse(appl.canBuild(player2));
+        // Inside fountain
+        appl = manager.getApplicableRegions(inFountain);
+        assertTrue(appl.canBuild(player2));
+    }
+
+}

tests/com/sk89q/worldguard/protection/CSVDatabaseTest.java

@@ -0,0 +1,124 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import java.io.*;
+import java.util.Map;
+import java.util.HashMap;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldguard.domains.DefaultDomain;
+
+public class CSVDatabaseTest {
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void testLoadSave() throws Exception {
+        File temp = File.createTempFile("worldguard_csv_test", ".tmp"); 
+        temp.deleteOnExit();
+        
+        Map<String,ProtectedRegion> regions =
+                new HashMap<String,ProtectedRegion>();
+        regions.put("test1", getTestRegion1());
+        regions.put("test2", getTestRegion2());
+        
+        CSVDatabase writeDB = new CSVDatabase(temp);
+        writeDB.setRegions(regions);
+        writeDB.save();
+        
+        CSVDatabase readDB = new CSVDatabase(temp);
+        readDB.load();
+
+        Map<String,ProtectedRegion> loaded = readDB.getRegions();
+        
+        ProtectedRegion region1 = loaded.get("test1");
+        checkTestRegion1(region1);
+    }
+    
+    private void checkTestRegion1(ProtectedRegion region) {
+        AreaFlags flags = new AreaFlags();
+        flags.allowFireSpread = AreaFlags.State.ALLOW;
+        flags.allowPvP = AreaFlags.State.DENY;
+        flags.allowLighter = AreaFlags.State.DENY;
+        region.setFlags(flags);
+        
+        assertEquals(region.getFlags(), flags);
+    }
+    
+    private ProtectedRegion getTestRegion1() {
+        BlockVector min = new BlockVector(1, 2, 3);
+        BlockVector max = new BlockVector(4, 5, 6);
+        
+        ProtectedRegion region = new ProtectedCuboidRegion(min, max);
+        
+        AreaFlags flags = new AreaFlags();
+        flags.allowFireSpread = AreaFlags.State.ALLOW;
+        flags.allowPvP = AreaFlags.State.DENY;
+        flags.allowLighter = AreaFlags.State.DENY;
+        region.setFlags(flags);
+        
+        DefaultDomain domain = new DefaultDomain();
+        domain.addGroup("members");
+        domain.addGroup("sturmehs");
+        domain.addPlayer("hollie");
+        domain.addPlayer("chad");
+        domain.addPlayer("tetsu");
+        region.setOwners(domain);
+        
+        region.setEnterMessage("hello there!");
+        region.setPriority(444);
+        
+        return region;
+    }
+    
+    private ProtectedRegion getTestRegion2() {
+        BlockVector min = new BlockVector(7, 8, 9);
+        BlockVector max = new BlockVector(10, 11, 12);
+        
+        ProtectedRegion region = new ProtectedCuboidRegion(min, max);
+        
+        AreaFlags flags = new AreaFlags();
+        flags.allowFireSpread = AreaFlags.State.DENY;
+        flags.allowPvP = AreaFlags.State.ALLOW;
+        flags.allowMobDamage = AreaFlags.State.DENY;
+        region.setFlags(flags);
+        
+        DefaultDomain domain = new DefaultDomain();
+        domain.addGroup("admins");
+        domain.addPlayer("jon");
+        domain.addPlayer("ester");
+        domain.addPlayer("amy");
+        region.setOwners(domain);
+        
+        region.setEnterMessage("Testing");
+        region.setPriority(555);
+        
+        return region;
+    }
+}

worldguard-blacklist.txt

@@ -11,17 +11,22 @@
 # Example to block ore and catch some events:
 # [coalore,goldore,ironore]
 # on-destroy-with=deny,log,kick
-# on-create=deny,tell
+# on-place=deny,tell
 #
 # Options:
 # - ignore-groups (comma-delimited list of groups to not affect)
+# - comment (message for yourself that is printed with 'log' and 'notify')
+# - message (optional message to show the user instead; %s is the item name)
 #
 # Events:
 # - on-destroy (when a block of this type is being destroyed)
+# - on-break (when a block of this type is about to be broken)
 # - on-destroy-with (the item/block held by the user while destroying)
-# - on-create (the item/block in the user's inventory is being created)
-# - on-use (the block is right clicked)
+# - on-place (a block is being placed)
+# - on-use (an item like a lighter is being used)
+# - on-right-click (the block is right clicked -- curently INEFFECTIVE)
 # - on-drop (the item is being dropped from the player's inventory)
+# - on-acquire (the item enters a player's inventory via some method)
 #
 # Actions (for events):
 # - deny (deny completely)
@@ -31,6 +36,13 @@
 # - kick (kick player)
 # - ban (ban player)
 #
+# With the on-acquire event, it will completely block item pick ups
+# (the item will still be on the ground) if you use 'deny' but the other
+# actions (notify, log, etc.) won't do anything. However, if the player
+# receives the item via a different method (i.e. from a chest), all actions
+# will work although the item is removed after a short delay rather than
+# blocked from the beginning (as it is part client-side).
+#
 # Users with the /worldguardnotify permission will be receive notifications.
 #
 # -------------
@@ -57,14 +69,22 @@
 # Some examples follow. Remember to remove # in front if you want them
 # to work for you!
 
+# Deny lava buckets
 #[lavabucket]
 #ignore-groups=admins,mods
-#on-destroy-with=deny,log,kick
-#on-create=deny,tell
+#on-use=deny,tell
 
+# Deny lighter usage
+#[259]
+#on-use=deny,tell
+
+# Deny some ore
 #[coalore,goldore,ironore]
-#ignore-groups=admins,mods,vip
+#ignore-groups=admins,mods
 #on-destroy=notify,deny,log
 
 #[cobblestone]
-#on-create=deny,tell,log
+#on-place=deny,tell,log
+
+#[lever]
+#on-break=deny,tell

worldguard.properties

@@ -0,0 +1,108 @@
+#
+# WorldGuard configuration
+#
+# This is a starter copy of WorldGuard's configuration so you can configure
+# WorldGuard right from the beginning. Copy it into your server folder
+# (into where server.properties resides) and edit the file as your desire.
+#
+
+# Display a summary of WorldGuard's core protection features (lava fire
+# disable and others) when Worldguard starts up.
+summary-on-start=true
+
+# Toggle the item durabiltiy fix
+item-durability=true
+
+# Simulate the sponge from Classic. It removes water and prevents water from
+# flowing into an area containing sponges. Use this to protect circuits
+# or to assist in underwater projects.
+simulate-sponge=false
+sponge-radius=3
+
+# Simulate classic water. Water will spread infinitely. Be aware that this
+# may likely flood your server.
+classic-water=false
+
+# Allow the placement of portal blocks anyway.
+allow-portal-anywhere=false
+
+# Prevent gravel from falling.
+no-physics-gravel=false
+
+# Prevent sand from falling.
+no-physics-sand=false
+
+# Kick the older player if a player attempts to join again without first
+# logging out the first instance.
+enforce-single-session=true
+
+# List of items to destroy on drop. You can also accomplish this using
+# the blacklist.
+item-drop-blacklist=
+
+# Simple prevention
+block-creepers=false
+block-lighter=false
+block-tnt=false
+
+# Login protection prevents players from getting any damage for a few
+# seconds after joining the server.
+login-protection=3
+
+# Spawn protection prevents players from getting any damage after spawning
+# (after dying).
+spawn-protection=0
+
+# This is an deprecated feature to fix a bug. This kicks a user once the
+# player dies and attemtps to respawn. The player can then still rejoin
+# and be alive.
+kick-on-death=false
+
+# Disable various ways of damage. If you want to give someone invincibility
+# or the ability to breathe under water, create the groups wg-invincible
+# and wg-amphibious respectively and apply them to users as needed.
+disable-fall-damage=false
+disable-lava-damage=false
+disable-fire-damage=false
+disable-water-damage=false
+disable-suffocation-damage=false
+
+# Teleports player when s/he is suffocating. This can be abused to get
+# through ceilings.
+teleport-on-suffocation=false
+
+# Disable fire spreading between blocks. Note that this does not prevent
+# fire damage -- it only prevents fire spread.
+disable-all-fire-spread=false
+
+# List blocks that fire should not spread to or between. Cloth and wood
+# are some good examples.
+disallowed-fire-spread-blocks=
+
+# Prevent lava from starting fires.
+disable-lava-fire=true
+
+# List of blocks that lava is allowed to spread onto.
+allowed-lava-spread-blocks=
+
+# List of blocks that should not be destroyed by water (Redstone wire,
+# minecart tracks, flowers, etc.).
+disable-water-damage-blocks=
+
+# Control where to log blacklist events to. You can use multiple log
+# methods as you please.
+log-console=true
+log-database-dsn=jdbc\:mysql\://localhost\:3306/minecraft
+log-database-pass=
+log-database-table=blacklist_events
+log-database-user=root
+log-database=false
+log-file-open-files=10
+log-file-path=worldguard/logs/%Y-%m-%d.log
+log-file=false
+
+# On death options.
+teleport-to-home-on-death=false
+exact-respawn=false
+
+#EOF

worldguard.updatr

@@ -0,0 +1,5 @@
+name = WorldGuard
+version = %version%
+url = updatr.update.sk89q.com/worldguard.updatr
+file = cloud.github.com/downloads/sk89q/worldguard/worldguard-%version%.zip
+notes =