[maven-release-plugin] prepare release 5.8

Existing data should be cast with no data loss.

.gitattributes

@@ -0,0 +1,2 @@
+*.java   diff=java
+

.gitignore

@@ -1,17 +1,6 @@
-/bin
-/build
-/dist
-/release
-/store
-/test
-/lib/Bukkit.jar
-/lib/Craftbukkit.jar
-/lib/truezip.jar
-/lib/WorldEdit.jar
-/nbproject/private
 .classpath
 .project
-manifest.mf
-/oldcmds
 .settings
-*.bat
+target
+
+.DS_Store

.travis.yml

@@ -0,0 +1,7 @@
+language: java
+jdk:
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
+notifications:
+  email: false

CHANGELOG.txt

@@ -1,3 +1,362 @@
+5.8:
+- BREAKING CHANGE: This version has been built for versions of Bukkit for MC 1.6.1 and
+  newer. Do not try to use this version of WG on an older Bukkit version.
+- Added support for Minecraft 1.6+. Actual support of new 1.6 additions is dependant on
+    Bukkit. Please use a newer build of Bukkit if, for example, you seem to be unable to
+    add "Horses" to your lists of entities.
+- Added mobs.disable-snowman-trails to disable the trails left by walking snowmen.
+- Added -a flag to /region removeowner and /region removemember to remove all objects.
+- Teleporting is now handled by entry/exit flags. If this is causing people to get
+    entirely stuck inside entry/exit deny regions, set the new setting
+    'use-player-teleports' to 'false' in your configuration.
+- Updated formatting for region commands, especially /region info.
+- Changed permissions checking for /region commands to be more consistent, checking for
+    region IDs as a sub-node. This means that if some permissions for some region
+    commands no longer work, add '.*' to the end of permission lines for WG in your
+    permission plugin.
+
+5.7.5:
+- Refixed a few issues from 5.7.4.
+
+5.7.4:
+- BREAKING CHANGE: Removed the cyan "**" in front of greeting
+  and farewell messages to allow more customizability. You can
+  re-add them by adding "&c**" to the flag.
+- Fixed an issue enderpearling inside exit/entry deny regions.
+- Added checks to players teleporting in and out of exit/entry regions. 
+- Fix bad matching in blocked and allowed command flags.
+- Fixed heal flag bugs when player max health was increased. 
+- Add fishing to xp blocker.
+- Applied other-explosion flag to entity damage as well.
+- Fixed an issue with interaction that should allow blacklisting item use actions with no block involved (eg fishing rods, potions) 
+- Fix witherskull/fireball settings not being differentiated in one case 
+- Allow cow milking in no-build areas
+- Fix infinite durability breaking items instantly.
+
+5.7.3:
+- Fixed the error caused by Bukkit's change of the TNT minecart API.
+
+5.7.2:
+- Updated to MineCraft 1.5.
+- Added TNT Minecart support. They are handled with the same flags/settings as TNT.
+- Added mining and smelting xp handling to the xp drops flag and setting.
+- Fixed a few edge cases for placing items on region borders.
+- Legacy: Fixed issue with //stack not respecting item metadata.
+
+5.7.1:
+- Added a vine growth config option and flag.
+- Added support for many commands to be used from console.
+  Usage is with -w flag and a world name e.g.
+  /rg addmem <id> <player> -w <worldname>
+  /rg flag <id> <flag> -w <worldname> <flagvalue>
+- Fixed bug that blocks placing plants in flower pots.
+- Fixed permissions check for /rg tp
+- Fixed enderchests not being accessible (they are now part of the USE flag)
+- Fixed an issue with slabs being placable in protected regions. This was
+  also fixed in CraftBukkit but has been left in for users running other versions.
+- Fixed wither skulls being handled with other fireballs, despite having their own settings.
+- Fixed item frames being placable on region borders.
+- Fixed a bug that made explosions more ineffective than they should have been.
+- Fixed bonemeal usage in protected regions.
+- Fixed special minecarts being placable in protected regions.
+- Fixed bugs being placable on region borders.
+- Fixed wolves bypassing pvp flags.
+
+5.7:
+- Fixed thread sync issue with FlagStateManager.
+- Fixed dragon egg region protection not working in certain cases.
+- Added beacon and anvil usage protection in regions.
+- Add mobs.block-enderdragon-portal-creation to stop enderdragons
+    from making portals on death.
+- Fix TNT being lethal in some case when damage was disabled.
+- Fix snowballs and enderpearls being able to knock players back in
+    pvp deny regions.
+- Add subcommand support for allowed and blocked command flags.
+- Add max-players-allowed and max-players-reject-message flags to
+    limit the numbers of players in a region.
+- Fix players being able to plant cocoa beans in protected areas.
+- Add an enderpearl flag to prevent players from teleporting to and
+    from regions.
+- Added mobs.block-other-explosions config setting and other-explosion
+    flag to block explosions caused by uncovered things, such as other
+    plugins. (It doesn't actually have to be a mob)
+- Fix mob damage setting and flag not blocking the DoT wither effect.
+- Ghast fireball flag will not block blaze fireballs from lighting things
+    on fire.
+- Fixed players without region permissions being able to trigger tripwires,
+    use enderchests, use wooden buttons, and put plants in flower pots.
+- Added mobs.block-zombie-door-destruction setting to stop zombies from
+    breaking down doors while difficulty is set to hard.
+
+Thank you to thvortex, Dilandau, tophathacker, and Dark_arc for their contributions this release.
+
+5.6.5:
+- Fixed a regression that caused paintings and item frames to no longer be properly
+    protected.
+
+5.6.4:
+- Added mobs.block-above-ground-slimes to block slimes spawning naturally above ground.
+- Added security.deop-everyone-on-join to de-op all players when they join.
+- Added security.block-in-game-op-command to prevent usage of /op from in-game.
+- Fixed a NullPointerException in PlayerInteract involving water potions and
+    potion blocking.
+- Fixed an issue with snowballs being blocked in regions.
+- Changed dragon eggs to be checked like it is a broken block in regions.
+- Moved developer's WGBukkit class to package com.sk89q.worldguard.bukkit.
+
+5.6.3:
+- Added helper WGBukkit class to get references to WorldGuard from other plugins.
+- Added physics.vine-like-rope-ladders to make ladders work like vines. As long as the
+    top ladder block is present, ladder blocks will hold even if they have no block
+    behind them, like a rope ladder.
+- Fixed NullPointerException in PlayerInteractEvent caused by potion blocking.
+- Fixed mobs.block-{item-frame,painting}-destroy not working.
+
+Thank you to def for testing the above fixes and features.
+
+5.6.2:
+- Fixed potion blocking not working well for splash potions.
+
+5.6.1:
+- Added a mycelium-spread region flag.
+- Added a dynamics.disable-mycelium-spread configuration setting.
+- Added new gameplay.block-potions option. For example:
+    gameplay:
+        block-potions: [invisibility, speed]
+- Fixed a bug in the entity explosion event handler that caused a NullPointerException.
+
+Thank you for gabizou for his contribution in this release.
+
+5.6:
+- Added official support for Minecraft 1.4. Support for 1.3.2 (and below) is still
+    provided in this release.
+- Added support for new and existing explosion types.
+- Added support for blocking withers with the following settings:
+    mobs:
+        block-wither-explosions: false
+        block-wither-block-damage: false
+        block-wither-skull-explosions: false
+        block-wither-skull-block-damage: true
+- Added support for blocking item frames (and their use) in protected regions.
+- Added item frame destruction region flags (if you wish to disable item frame 
+    destruction completely).
+- (Re-)added support for priority R-tree region indexes. This means quicker region lookup,
+    and better support for servers with thousands of regions.
+- Improved /region info output for -g group flags.
+- Allowed removing of -g group flags with /region flag.
+- Allowed /region flag to set group and value at once.
+- Deleting a region flag now also deletes group flag.
+- Fixed detection of attack by projectiles to be more accurate.
+- Fixed support for saving non-string flags in the MySQL region support.
+- Fixed spurious comma in "Flags:" /region info output.
+- Fixed players who are not in god mode not receiving damage in PVP areas from
+    enderpearls.
+- Players will now be told that they are in a no-PvP area if they are in one and
+    attempting to attack someone, or that the player they are attacking is in a
+    no-PvP area, if that is the case instead.
+- Fixed an issue where region.getId() was lowercase'd each pass of a for loop in
+    MySQLDatabase.updatePoly2dPoints().
+- Fixed mob damage from projectiles not being properly blocked in regions where
+    applicable.
+- Changed default region wand to leather (#334).
+
+Thank you to the following individuals for their contribution:
+thvortex, Rutr, Glitchfinder, and DarthAndroid.
+
+5.5.4:
+- Minecraft 1.3 support.
+- Fixed /stack dupe bugs.
+- Added regions.use-creature-spawn-event.
+- Update for Async chat issue.
+- Add use flag to cakes.
+- Report number of plugins loaded in report writer.
+- Updated fireblal item blocking.
+- Fixed permissions for /region reload.
+
+5.5.3:
+- Added game mode flag.
+- Added item drop pickup flag to regions.
+- Added support for fireball item blocking (385).
+- Added configuration option to allow creature spawns from plugins.
+- Added host key check.
+- Added a new line split feature to region greetings.
+- Prevented commands in the allow commands list from being blocked and
+    vice versa.
+
+5.5.2:
+- Added potion-splash flag to block splash potions
+- Add entity-painting-destroy which can be used to prevent entities from destroying
+    paintings (skeletons firing arrows)
+- Added send-chat and receive-chat flags
+- Fixed having regions in multiple worlds with the same name not working with MySQL
+- A cancellable event is now fired if WorldGuard disallows PvP. (for developers!)
+- Made /region setparent check worldguard.region.setparent.own/member.<parent> instead
+    of worldguard.region.setparent.own/member.<child>.
+- Allowed passing #<index> in place of a region ID, where <index> is the index as
+    displayed by /region list.
+- Fixed an error that occured when clearing a non-existant region's parent.
+- Added a -s flag to /region teleport, which sends you to the spawn point instead of the
+    teleport point of a region.
+- Added region/role-based permissions to /region teleport.
+- BREAKING CHANGE: Added a LocationFlag class and made the teleport and spawn flags
+    use it.
+- /region info -s now selects the region being queried.
+- Added /region teleport <id>.
+- Vector flags can now be set to the current location with the value "here" and to a
+    specific position with x,y,z.
+- Made /region info show the region you're in if you don't specify an id explicitly.
+- Prevent block ignition from lightning strikes if lightning is blocked in region. Fixes
+    #1175
+- Correctly check both WEPIF and superperms in WorldGurdPlugin.broadcastNotification()
+- Destroy fire blocks when fire-spread is disallowed
+- Added a construct flag that can be used to restrict block placing/destroying in zones
+    to certain roles.
+- Added FallingSand to list of intensive entities to be removed with /halt-activiy.
+- Replaced all usage of CreatureType by EntityType.
+- Updated to support Bukkit 1.2-R0.3 and newer
+- Made auto-god-mode disabled by default again.
+- Added sign protection check disable.
+- Cleaned up javadoc, deprecated duplicate methods, other cleanup
+- Added a RegionGroupFlag to evey region flag Using the /region flag command with -g,
+    the region group that the region flag applies to can be set.
+
+5.5.1:
+- Fixed attacking with arrows from non-PVP to PVP areas
+- Compatibility with Bukkit 1.1-R5
+- Removed broken suppress-tick-sync-warnings config option. See bukkit.yml's setings.warn-on-overload option instead.
+- Add region and 'can build' information to CommandBook's /whois
+
+Contributions thanks to: NolanSyKinsley
+
+5.5:
+- Removed WorldEdit.jar from the classpath to stop conflicts with Bukkit's plugin loader
+- Now using Bukkit's tagged logging
+- Updated to new event system
+- Flush player flag state cache on world change
+- Improved compatibility with versions of CommandBook without GodComponent and updated pom dep for 2.0
+- Added MySQL region storage method.
+- Made explosions display their animations even when the event was blocked.
+- Added fallback support for those who don't have a version of CommandBook with GodComponent
+- Added LIGHTNING flag to DefaultFlag's flagsList Fixes #1026
+- Removed /god, /heal, /locate, and /stack from WorldGuard to CommandBook. CommandBook is now checked to see whether a player is godded.
+- Removed remaining usages of org.bukkit.util.config.Configuration
+- Removed some unused configuration options
+- Added permission worldguard.region.wand to the region wand
+- Fixed ProtectedRegion.compareTo.
+- Fixed FlatRegionManager.getApplicableRegions to return parent regions as well.
+- Added exp-drops flag to disable experience drops per-region.
+- Fixed some warnings.
+- Updated dependency version for WorldGuard from 5.0 to 5.1-SNAPSHOT.
+- Added support for fireballs shot by players being blocked by the PVP flag.
+- Now using dynamic command registration
+- Split off ender dragon block damage from creeper block damage.
+
+Contributions thanks to: narthollis, DarkArc, Wolvereness, and skeight
+
+5.4:
+- Fixed configuration generation on Windows
+- Fixed intersection calculation for regions
+- Fixed timer and feeding delay for food flags
+- Fixed region managers not being created properly (This caused errors related to CREATURE_SPAWN)
+- Added support for Minecraft 1.0.1 blocks
+- Added support for enchantments and tool damage (worldguard.stack.damaged is the node) with /stack
+- Made being in the wg-invincible group respect the configuration's auto-invincible setting
+- Added per-group region claim limit maximum
+- Added worldguard.region.addowner.unclaimed.* permission for non-economy region 'buying'
+- Checking allowed/blocked commands now occurs earlier to override more plugins
+- Made PVP flag check whether either player is in a pvp deny region for blocking
+
+Contributions thanks to: epuidokas, wizjany, Turtle9598, and DerFlash
+
+5.3:
+- Added new config options and flags to better handle explosions of all types
+- Added config options and flags for snow, ice, mushroom spread, grass spread,
+    and leaf decay
+- Added min and max health flags to clamp the values for the existing healing
+    flags
+- Added hunger flags similar to the existing healing flags
+- Added an option to disable the use of the move event. This can boost
+    performance on large servers but will disable the greeting/farewell
+    and entry/exit flags
+- Added flag to prevent pistons (including those that are outside the
+    region, but would affect blocks inside the region)
+- Added a /wg flushstates [player] command to free players stuck in a
+    region that was exit-deny but no longer exists or the flag was removed
+- Added a config option to disable xp orb dropping
+- Added config option to disable redstone wire obsidian generators
+- Added a vehicle-destroy flag
+- Added enderman protection config and flag
+- Allowed and blocked command flags will now fall back to the global region
+- The worldguard.region.flag.own/member permissions are now
+    worldguard.region.flag.regions.own/member! Please change your permissions
+    accordingly.
+- Made //stack respect max stack sizes unless the player has the
+    worldguard.stack.illegitimate permission
+- Setting invincibility flag to deny will override god mode unless the player
+    has worldguard.god.override-regions
+- The sleep flag will now prevent beds in the nether from
+    exploding if set to deny
+- Existing regions can no longer be accidentally overwritten.
+    Use /region redefine to move an existing region.
+- The info command will now sort players alphabetically
+- Priming TNT by punching it with flint and steal should throw a blacklist
+    event (consistent with old Minecraft versions)
+- The /stoplag command will now remove xp orbs
+- Permissions system will use per-world permissions if the provider supports it
+- Players in vehicles are now subject to entry/exit and greeting/farewell flags
+- Fixed interact blacklist event not logging correctly
+- Fixed heal flag taking effect half a block northeast of the region
+- Fixed a infinite sign dropping bug
+- Fixed players being able to douse fire by punching it in regions they
+    couldn't build it
+- Fixed players being able to eat protected cake
+- Fence gate usage can be blocked with the use flag
+- Fixed chests being unprotected when they should be in 1.8
+- Fixed weather config settings not applying when a world was loaded
+- Fixed explosion handling in certain cases
+- Fixed arrows working in non-pvp zones
+- Fixed buckets working on the border of protected regions in certain cases
+Contributions thanks to:
+wizjany, zml2008, imjake9, Droolio, epuidokas,
+EduardBaer, TomyLobo, and halvors
+
+5.2.2:
+- Changed configuration saving so empty lists will be added to
+    the configuration files.
+
+5.2.1:
+- Add region bounds to /region info
+- Added the ability to add owners/members to the global region for
+    handling guest groups. Now if there's owners or members on the global
+    region, then those  that are not on the list cannot build.
+- Fixed some flag algorithm issues.
+- API: Fixed DefaultDomain.size() not counting players.
+- API: Undeprecated ApplicableRegionSet.allows(StateFlag).
+
+5.2:
+- Gave the ability to use color colors and macros in greeting
+    and farewell messages.
+- Added disable-ice-melting, disable-snow-formation, disable-mushroom-spread,
+    disable-snow-melting, disable-ice-formation.
+- Added paintings to blacklist support.
+- Added default.disable-health-regain.
+- Added auto-invincible-permission setting, which lets you use the permission
+    'worldguard.auto-invincible' to become invincible on join automatically.
+- Flames won't appear if you are /god'ed now. 
+- Added blocked-cmds region flag to block commands.
+- Added allowed-cmds region flag to whitelist commands.
+- Added entry region flag to block entry. Use entry-group to determine who
+    this affects.
+- Added exit region flag to block exit. Use exit-group to determine who
+    this affects.
+- Made negative healing possible via the healing flag.
+- Changed the configuration header messages to be more helpful to new users.
+- Added a warning about modifying region files by hand.
+- Improved the API for plugin developers.
+
+5.1:
+- A lot of changes.
+
 4.0-alpha1:
 - This release is only to fix WorldGuard for Bukkit. Ignore the 4.0
     label. Just move along. Nothing to see.
@@ -226,4 +585,4 @@
 - Added block lag fix.
 
 1.0
-- Initial release.
+- Initial release.

CONTRIBUTING.md

@@ -0,0 +1,69 @@
+Contributing
+============
+
+Thank you for your interest in contributing to WorldGuard! We appreciate your 
+effort, but to make sure that the inclusion of your patch is a smooth process, we
+ask that you make note of the following guidelines.
+
+* **Follow the [Oracle coding conventions](http://www.oracle.com/technetwork/java/codeconv-138413.html).**
+  We can't stress this enough; if your code has notable issues, it may delay
+  the process significantly.
+* **Target Java 6 for source and compilation.** Make sure to mark methods with
+  ` @Override` that override methods of parent classes, or that implement
+  methods of interfaces (Java 6+).
+* **Use only spaces for indentation.** Our indents are 4-spaces long, and tabs
+  are unacceptable.
+* **Wrap code to a 89 column limit.** We do this to make side by side diffs
+  and other such tasks easier. Ignore this guideline if it makes the code
+  too unreadable.
+* **Write complete Javadocs.** Do so only for public methods, and make sure
+  that your `@param` and `@return` fields are not just blank.
+* **Don't tag classes with @author.** Some legacy classes may have this tag,
+  but we are phasing it out.
+* **Make sure the code is efficient.** One way you can achieve this is to spend
+  around ten minutes to think about what the code is doing and whether it
+  seems awfully roundabout. If you had to copy the same large piece of
+  code in several places, that's bad.
+* **Keep commit summaries under 70 characters.** For more details, place two
+  new lines after the summary line and write away!
+* **Test your code.** We're not interested in broken code, for the obvious reasons.
+* **Write unit tests.** While this is strictly optional, we recommend it for
+  complicated algorithms.
+
+
+Checklist
+---------
+
+Ready to submit? Perform the checklist below:
+
+1. Have all tabs been replaced into four spaces? Are indentations 4-space wide?
+2. Have I written proper Javadocs for my public methods? Are the @param and
+   @return fields actually filled out?
+3. Have I `git rebase`d my pull request to the latest commit of the target
+   branch?
+4. Have I combined my commits into a reasonably small number (if not one)
+   commit using `git rebase`?
+5. Have I made my pull request too large? Pull requests should introduce
+   small sets of changes at a time. Major changes should be discussed with
+   the team prior to starting work.
+6. Are my commit messages descriptive?
+
+You should be aware of [`git rebase`](http://learn.github.com/p/rebasing.html).
+It allows you to modify existing commit messages, and combine, break apart, or
+adjust past changes.
+
+Example
+-------
+
+This is **GOOD:**
+
+    if (var.func(param1, param2)) {
+        // do things
+    }
+
+This is **EXTREMELY BAD:**
+
+    if(var.func( param1, param2 ))
+    {
+        // do things
+    }

README.html

@@ -0,0 +1,232 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>${project.name} ${version}</title>
+<link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Ropa+Sans" rel="stylesheet" type="text/css">
+<style>
+body {
+    margin: 0;
+    padding: 3em 1em;
+    background: #efefef;
+    color: #333;
+    line-height: 1.5;
+}
+#wrapper {
+    width: 600px;
+    margin: auto;
+}
+body, th, td, input {
+    font: 14px 'Source Sans Pro', Arial, sans-serifsans-serif;
+}
+.section {
+	background: #fff;
+	position: relative;
+	padding: 2em 2.4em;
+	margin: 3em auto 4em auto;
+    width: 80%;
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+}
+.section:before, .section:after {
+	content: "";
+	position: absolute;
+	z-index: -2;
+}
+.section {
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+.section:before, .section:after {
+	bottom: 15px;
+	left: 10px;
+	width: 50%;
+	height: 20%;
+	max-width: 300px;
+	max-height: 100px;
+    -webkit-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
+    box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
+    -webkit-transform: rotate(-1deg);
+    -moz-transform: rotate(-1deg);
+    -ms-transform: rotate(-1deg);
+    -o-transform: rotate(-1deg);
+    transform: rotate(-1deg);
+}
+.section:after {
+    right: 10px;
+    left: auto;
+    -webkit-transform: rotate(1deg);
+    -moz-transform: rotate(1deg);
+    -ms-transform: rotate(1deg);
+    -o-transform: rotate(1deg);
+    transform: rotate(1deg);
+}
+a:link, a:visited {
+    color: #0004b2;   
+    text-decoration: none;
+}
+a:hover {
+    color: #ac0000;
+    text-decoration: none;
+    border-bottom: 1px solid #999;
+}
+h1 {
+    font: 2.7em 'Ropa Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif;
+    color: #000;
+    margin: 0 0;
+    padding: 0 0 0.2em 0;
+    font-weight: normal;
+    text-align: center;
+    text-shadow: 2px 2px #FFF;
+}
+h2 {
+    font-size: 1.3em;
+    color: #FFF;
+    margin: -2.5em 0 0.8em 0;
+    float: left;
+    background: #0049FF;
+    padding: 0.4em 0.8em;
+    border-radius: 0.2em;
+    font-weight: normal;
+    text-align: center; 
+}
+h3 {
+    text-transform: uppercase;
+    font-weight: bold;
+}
+h2 + * {
+    clear: both;
+}
+@media (max-width: 650px) {
+    #wrapper {
+        width: 100%;
+    }
+}
+</style>
+</head>
+<body>
+
+<div id="wrapper">
+    <h1>${project.name} ${version}</h1>
+    <div class="section">
+        <h2>Getting Started</h2>
+        <p>
+            Thanks for choosing ${project.name}! When you first install ${project.name},
+            nothing will be enabled, so you will need to switch on the features
+            that you need to use, whenever it is convenient for you.
+        </p>
+        <ul>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Installation">How do I install ${project.name}?</a></li>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Upgrading">How do I update ${project.name}?</a></li>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}#Usage">How do I use ${project.name}?</a></li>
+        </ul>
+        <p>
+            Need help?
+            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
+        </p>
+    </div>
+    <div class="section">
+        <h2>Common Issues</h2>
+        
+        <h3>What are the other files that come with the download?</h3>
+        <p>
+            Inside the folder "contrib" of the download are the following files:
+        </p>
+        <ul>
+            <li>blacklist_table.sql is for using a database with the 
+              <a href="http://wiki.sk89q.com/wiki/${project.name}/Blacklist">blacklist feature</a>.</li>
+            <li>region_storage.sql is for using a database with the
+                <a href="http://wiki.sk89q.com/wiki/${project.name}/Regions">region protection feature</a>.</li>
+            <li>region_storage_update_20110325.sql is for updating your region protection
+                database (if you're using it) if your database was made before March 25, 2011.</li>
+        </ul>
+        
+        <h3>${project.name} doesn't seem to work.</h3>
+        <p>
+            Two common mistakes include forgetting to install WorldEdit
+            (${project.name} needs it), or making
+            a syntax error in one of ${project.name}'s configuration files (this is very
+            fatal unfortunately, and can be caused by a single character typed in the wrong place). Try 
+            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">asking in IRC</a>
+            to see whether anyone can help you.
+        </p>
+        
+        <h3>How do I protect my spawn, or another area?</h3>
+        <p>
+            Read the <a href="http://wiki.sk89q.com/wiki/${project.name}/Regions/Tutorial">area protection tutorial</a>
+            on our wiki. For more detailed information, be sure to read about
+            <a href="http://wiki.sk89q.com/wiki/WorldGuard/Regions">region protection on the wiki</a>. Note
+            that if you can't build in spawn, don't forget that Minecraft comes with its own
+            limited spawn protection that you have to disable (see below).
+        </p>
+        
+        <h3>I or others don't have permission to build.</h3>
+        <p>
+            Unless you copied configuration files from an older installation of 
+            ${project.name}, your problem is either caused by another plugin, or by not
+            disabling the built-in spawn protection of the Minecraft server.
+        </p>
+        
+        <h3>No one can build in a region I made!</h3>
+        <p>
+            Make sure that:
+        </p>
+        <ul>
+            <li>You didn't change the 'build' flag, because protection is on by default
+                when a new region is made. Setting the build flag to 'deny' means that
+                no one can modify the things inside the region.</li>
+            <li>That you added the player as an owner or member of the region. If you are using
+                a group (g:groupName), you may have to give the group the permission of
+                group.groupName for ${project.name} to recognize it.</li>
+            <li>That you disabled spawn protection. The Minecraft server has an automatic
+                spawn protection feature where only 'ops' can build in a definable
+                radius around spawn (by default, it is 16 blocks). If you are on Minecraft
+                1.4 or newer, edit "spawn-protection" in server.properties; otherwise, modify bukkit.yml
+                and change the spawn-radius setting.</li>
+            <li>That it's not another plugin causing you trouble. The error messages of ${project.name} are of
+                a dark red shade. If the color of the "no permission" message is not
+                that color, it is not ${project.name}.</li>
+        </ul>
+        
+        <h3>Everyone can build in a region I made!</h3>
+        <p>
+            Make sure that:
+        </p>
+        <ul>
+            <li>You didn't change the 'build' flag, because protection is on by default
+                when a new region is made. Setting the build flag to 'allow' means that
+                anyone can modify the things inside the region.</li>
+            <li>That it's not caused by another plugin. If players are getting a dark red
+                permission denied message, but they can still build, another plugin
+                is likely causing the conflict.</li>
+        </ul>
+        
+        <h3>Where do I report bugs or suggest ideas?</h3>
+        <p>
+            Make sure you are using the latest version of ${project.name}, try asking in
+            IRC first (see "Need help?" above) if it's a problem, and if you think you've
+            found a bug or have a great suggestion to provide, please
+            report it to <a href="http://youtrack.sk89q.com/issues/WORLDGUARD">our issue tracker</a>.
+        </p>
+        
+        <p>
+            Still need help?
+            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
+        </p>
+    </div>
+    <div class="section">
+        <h2>Contributing</h2>
+        <p>
+            Did you know that ${project.name} is open source? That means that you can
+            read the code and learn from it, as well as modify it and submit back
+            changes to help the community!
+        </p>
+        <ul>
+            <li><a href="https://github.com/sk89q/worldguard">View the source code</a></li>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Development">More information</a></li>
+        </ul>
+    </div>
+</div>
+</body>
+</html>

README.md

@@ -0,0 +1,38 @@
+![WorldGuard](http://static.sk89q.com/readme/worldguard.png)
+==========
+
+WorldGuard is a toolbox of various functions, useful for multiplayer servers, that lets you:
+
+* Protect your server from a number of problems.
+* Block fire spread, lava spread, endermen, and more.
+* Flag areas as "no PVP" or "no TNT."
+* Assign ownership to areas so only selected individuals can build.
+* Use a number of useful commands.
+
+WorldGuard is open source and is available under the GNU General Public License v3.
+
+Compiling
+---------
+
+The project is written for Java 6 and our build process makes use of [Maven](http://maven.apache.org). Detailed compilation information [can be found on the wiki](http://wiki.sk89q.com/wiki/WorldGuard/Development#Compiling).
+
+Dependencies are automatically handled by Maven.
+
+Contributing
+------------
+
+We happily accept contributions, especially through pull requests on GitHub. Submissions 
+must be licensed under the GNU General Public License v3.
+
+Please read CONTRIBUTING.md for important guidelines to follow.
+
+We recommend following our [mailing list](https://groups.google.com/d/forum/sk-dev-discuss), especially if you have some big ideas that you want to implement.
+
+Links
+-----
+
+* [Mailing list](https://groups.google.com/d/forum/sk-dev-discuss)
+* [IRC channel](http://skq.me/irc/irc.esper.net/sk89q/) (#sk89q on irc.esper.net)
+* [Issue tracker](http://youtrack.sk89q.com/issues/WORLDGUARD)
+* [Continuous integration](http://build.sk89q.com) [![Build Status](https://secure.travis-ci.org/sk89q/worldguard.png)](http://travis-ci.org/sk89q/worldguard)
+* [End-user documentation](http://wiki.sk89q.com/wiki/WorldGuard)

README.txt

@@ -1,23 +0,0 @@
-WorldGuard
-Copyright (c) 2010, 2011 sk89q <http://www.sk89q.com>
-Licensed under the GNU Lesser General Public License v3
-
-Introduction
-------------
-
-WorldGuard protects your server!
-
-Documentation can be found at:
-http://wiki.sk89q.com/wiki/WorldGuard
-
-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.txt

@@ -1,85 +0,0 @@
-#
-# This is the blacklist for WorldGuard. The blacklist allows you to perform
-# actions depending on an item or block ID. Comments start with # and they
-# are ignored so you can put your own notes.
-#
-# --------------------------------------------------------------------------
-#
-# WARNING:
-# Remember to check the compatibility spreadsheet for WorldGuard to see
-# if any events or actions are currently broken in your version of Bukkit.
-#
-# --------------------------------------------------------------------------
-#
-# Format:
-# [item1,item2]
-# option1=options
-# event1=whatToDo1,whatToDo2,whatToDo3
-# event2=whatToDo1,whatToDo2
-#
-# Example to block some ore mining and placement:
-# [coalore,goldore,ironore]
-# on-break=deny,log,kick
-# on-place=deny,tell
-#
-# Options:
-# - ignore-groups (comma-separated 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-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-place (a block is being placed)
-# - on-use (an item like flint and steel or a bucket is being used)
-# - on-interact (when a block in used (doors, chests, etc.))
-# - on-drop (an item is being dropped from the player's inventory)
-# - on-acquire (an item enters a player's inventory via some method)
-#
-# Actions (for events):
-# - deny (deny completely, used blacklist mode)
-# - allow (used in whitelist mode)
-# - notify (notify admins)
-# - log (log to console/file/database)
-# - tell (tell a player that that's not allowed)
-# - kick (kick player)
-# - ban (ban player)
-#
-# Users with the /worldguardnotify permission will receive notifications.
-#
-# -------------
-#
-# You can have the same block or item used in two different sections and
-# they will both apply:
-#
-# [goldblock]
-# ignore-groups=vip
-# on-break=deny
-# [goldblock]
-# ignore-groups=admins
-# on-break=tell
-#
-# However, some events override others. For example, if you disable both
-# usage of the diamond pickaxe (with the on-destroy-with event) and
-# destruction of gold blocks (with the on-break event) and a player tries
-# to destroy a gold block with a diamond pickaxe, because the
-# on-destroy-with event comes first, the rules for the gold block
-# will not be applied (but the player will be denied nevertheless).
-#
-# --------------------------------------------------------------------------
-#
-# Some examples follow.
-#
-# REMEMBER: If a line has # in front, it will be ignored.
-#
-# --------------------------------------------------------------------------
-
-# Deny lava buckets
-#[lavabucket]
-#ignore-groups=admins,mods
-#on-use=deny,tell
-
-# Deny some ore
-#[coalore,goldore,ironore]
-#ignore-groups=admins,mods
-#on-break=notify,deny,log

build.xml

@@ -1,111 +0,0 @@
-<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"/>
-  <property name="docs.dir" location="docs"/>
-
-  <fileset id="libs" dir="${lib.dir}">
-    <include name="truezip.jar" />
-    <include name="Bukkit.jar" />
-    <include name="WorldEdit.jar" />
-    <include name="iConomy.jar" />
-    <include name="prtree.jar" />
-  </fileset>
-
-  <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 refid="libs"/>
-      </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 WorldGuard/WorldEdit.jar"/>
-    </manifest>
-    <delete file="${build.dir}/plugin.yml"/>
-    <copy tofile="${build.dir}/plugin.yml" file="plugin.yml"/>
-    <replace file="${build.dir}/plugin.yml" token="WGVERSIONMACRO" value="${version}"/>
-    <mkdir dir="${build.dir}/defaults"/>
-    <copy tofile="${build.dir}/defaults/config.yml" file="config.yml"/>
-    <copy tofile="${build.dir}/defaults/config_world.yml" file="config_world.yml"/>
-    <copy tofile="${build.dir}/defaults/blacklist.txt" file="blacklist.txt"/>
-    <jar jarfile="${dist.dir}/WorldGuard.jar" basedir="${build.dir}" manifest="manifest.mf">
-        <zipgroupfileset dir="lib" includes="prtree.jar" />
-    </jar>
-  </target>
-
-  <!-- Create the .jar -->
-  <target name="dist">
-    <property name="version" value="nightly"/>
-    <antcall target="jar"/>
-  </target>
-
-  <!-- Build a release -->
-  <target name="release" depends="clean">
-    <input message="Enter version:" addproperty="version"/>
-    <antcall target="jar"/>
-    <delete dir="${release.dir}"/>
-    <mkdir dir="${release.dir}"/>
-    <copy tofile="${release.dir}/README.txt" file="README.txt"/>
-    <copy tofile="${release.dir}/LICENSE.txt" file="LICENSE.txt"/>
-    <copy tofile="${release.dir}/CHANGELOG.txt" file="CHANGELOG.txt"/>
-    <copy tofile="${release.dir}/blacklist_table.sql" file="blacklist_table.sql"/>
-    <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>
-
-  <!-- Javadoc -->
-  <target name="javadoc">
-    <javadoc access="public" author="true" destdir="${docs.dir}" doctitle="WorldGuard API" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" sourcepath="src" splitindex="true" use="true" version="true">
-      <classpath>
-        <fileset refid="libs"/>
-      </classpath>
-    </javadoc>
-  </target>
-  
-  <!-- Clean the output -->
-  <target name="clean">
-    <delete dir="${build.dir}"/>
-    <delete dir="${dist.dir}"/>
-    <delete dir="${release.dir}"/>
-    <delete dir="${docs.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_world.yml

@@ -1,121 +0,0 @@
-#
-# WorldGuard's configuration file.
-#
-# This is the a per-world configuration file. It only affects one
-# corresponding world.
-#
-# About editing this file:
-# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If
-#   you use an editor like Notepad++ (recommended for Windows users), you
-#   must configure it to "replace tabs with spaces." In Notepad++, this can
-#   be changed in Settings > Preferences > Language Menu.
-# - Don't get rid of the indents. They are indented so some entries are
-#   in categories (like "enforce-single-session" is in the "protection"
-#   category.
-# - If you want to check the format of this file before putting it
-#   into WorldGuard, paste it into http://yaml-online-parser.appspot.com/
-#   and see if it gives "ERROR:".
-# - Lines starting with # are comments and so they are ignored.
-#
-
-summary-on-start: on
-pumpkin-scuba: off
-
-protection:
-    item-durability: on
-    remove-infinite-stacks: off
-
-simulation:
-    sponge:
-        enable: on
-        redstone: off
-        radius: 3
-
-physics:
-    no-physics-gravel: off
-    no-physics-sand: off
-    allow-portal-anywhere: off
-    disable-water-damage-blocks: []
-
-ignition:
-    block-tnt: off
-    block-lighter: off
-
-fire:
-    disable-all-fire-spread: off
-    disable-fire-spread-blocks: []
-    disable-lava-fire-spread: on
-    lava-spread-blocks: []
-
-weather:
-    disable-lightning-strike-fire: off
-    prevent-lightning-strike-blocks: []
-    # The following don't work yet
-    disable-weather: off
-    disable-thunderstorm: off
-    disable-pig-zombification: off
-    always-raining: off
-    always-thundering: off
-    disable-powered-creepers: off
-
-mobs:
-    block-creeper-explosions: off
-    block-creeper-block-damage: off
-    block-creature-spawn: []
-    anti-wolf-dumbness: false
-
-spawn:
-    login-protection: 3
-    spawn-protection: 0
-    kick-on-death: off
-    exact-respawn: off
-    teleport-to-home-on-death: off
-
-player-damage:
-    disable-fall-damage: off
-    disable-lava-damage: off
-    disable-fire-damage: off
-    disable-lightning-damage: off
-    disable-drowning-damage: off
-    disable-suffocation-damage: off
-    disable-contact-damage: off
-    teleport-on-suffocation: off
-    disable-void-damage: off
-    teleport-on-void-falling: off
-
-regions:
-    enable: on
-    wand: 287
-    max-claim-volume: 30000
-    claim-only-inside-existing-regions: off
-    max-region-count-per-player: 7
-    high-frequency-flags: off
-
-iconomy:
-    enable: on
-    buy-on-claim: on
-    # Price per block for buying on claim
-    buy-on-claim-price: 2
-
-chest-protection:
-    enable: off
-
-crops:
-    disable-creature-trampling: off
-    disable-player-trampling: off
-
-blacklist:
-    use-as-whitelist: off
-    logging:
-        console:
-            enable: on
-        database:
-            enable: off
-            dsn: jdbc:mysql://localhost:3306/minecraft
-            user: root
-            password: pass
-            table: blacklist_events
-        file:
-            enable: on
-            path: worldguard/logs/%w-%Y-%m-%d.log
-            open-files: 10

contrib/blacklist_table.sql

@@ -1,24 +1,24 @@
--- Blacklist table for MySQL.
--- You must still configure WorldGuard to use your database.
--- If you do not plan on using a database for logging blacklist events,
--- you do not need to do anything with this file.
-
-CREATE TABLE `blacklist_events` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `event` varchar(25) NOT NULL,
-  `world` varchar(32) NOT NULL,
-  `player` varchar(16) NOT NULL,
-  `x` int(11) NOT NULL,
-  `y` int(11) NOT NULL,
-  `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 
-
+-- Blacklist table for MySQL.
+-- You must still configure WorldGuard to use your database.
+-- If you do not plan on using a database for logging blacklist events,
+-- you do not need to do anything with this file.
+
+CREATE TABLE `blacklist_events` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `event` varchar(25) NOT NULL,
+  `world` varchar(32) NOT NULL,
+  `player` varchar(16) NOT NULL,
+  `x` int(11) NOT NULL,
+  `y` int(11) NOT NULL,
+  `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 
+
 ALTER TABLE `blacklist_events` ADD `world` VARCHAR( 32 ) NOT NULL 

contrib/region_storage.sql

@@ -0,0 +1,217 @@
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL';
+
+-- -----------------------------------------------------
+-- Table `group`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `group` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `name` VARCHAR(64) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  UNIQUE INDEX `name` (`name` ASC) )
+ENGINE = InnoDB
+AUTO_INCREMENT = 5
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `world`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `world` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `name` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  UNIQUE INDEX `name` (`name` ASC) )
+ENGINE = InnoDB
+AUTO_INCREMENT = 9
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region` (
+  `id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `type` ENUM('cuboid','poly2d','global') CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `priority` SMALLINT(6) NOT NULL DEFAULT '0' ,
+  `parent` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NULL DEFAULT NULL ,
+  PRIMARY KEY (`id`, `world_id`) ,
+  INDEX `fk_region_world` (`world_id` ASC) ,
+  INDEX `parent` (`parent` ASC) ,
+  CONSTRAINT `fk_region_world1`
+    FOREIGN KEY (`world_id` )
+    REFERENCES `world` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `parent`
+    FOREIGN KEY (`parent` )
+    REFERENCES `region` (`id` )
+    ON DELETE SET NULL
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_cuboid`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_cuboid` (
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `min_x` BIGINT(20) NOT NULL ,
+  `min_y` BIGINT(20) NOT NULL ,
+  `min_z` BIGINT(20) NOT NULL ,
+  `max_x` BIGINT(20) NOT NULL ,
+  `max_y` BIGINT(20) NOT NULL ,
+  `max_z` BIGINT(20) NOT NULL ,
+  PRIMARY KEY (`region_id`, `world_id`) ,
+  INDEX `fk_region_cuboid_region` (`region_id` ASC) ,
+  CONSTRAINT `fk_region_cuboid_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_flag`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_flag` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `flag` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `value` VARCHAR(256) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  INDEX `fk_flags_region` (`region_id` ASC, `world_id` ASC) ,
+  CONSTRAINT `fk_flags_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+AUTO_INCREMENT = 3246
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_groups`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_groups` (
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `group_id` INT(10) UNSIGNED NOT NULL ,
+  `owner` TINYINT(1) NOT NULL ,
+  PRIMARY KEY (`region_id`, `world_id`, `group_id`) ,
+  INDEX `fk_region_groups_region` (`region_id` ASC) ,
+  INDEX `fk_region_groups_group` (`group_id` ASC) ,
+  CONSTRAINT `fk_region_groups_group`
+    FOREIGN KEY (`group_id` )
+    REFERENCES `group` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_region_groups_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `user`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `user` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `name` VARCHAR(64) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  UNIQUE INDEX `name` (`name` ASC) )
+ENGINE = InnoDB
+AUTO_INCREMENT = 82
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_players`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_players` (
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `user_id` INT(10) UNSIGNED NOT NULL ,
+  `owner` TINYINT(1) NOT NULL ,
+  PRIMARY KEY (`region_id`, `world_id`, `user_id`) ,
+  INDEX `fk_region_players_region` (`region_id` ASC) ,
+  INDEX `fk_region_users_user` (`user_id` ASC) ,
+  CONSTRAINT `fk_region_users_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_region_users_user`
+    FOREIGN KEY (`user_id` )
+    REFERENCES `user` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_poly2d`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_poly2d` (
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `min_y` INT(11) NOT NULL ,
+  `max_y` INT(11) NOT NULL ,
+  PRIMARY KEY (`region_id`, `world_id`) ,
+  INDEX `fk_region_poly2d_region` (`region_id` ASC) ,
+  CONSTRAINT `fk_region_poly2d_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_poly2d_point`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_poly2d_point` (
+  `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `x` BIGINT(20) NOT NULL ,
+  `z` BIGINT(20) NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  INDEX `fk_region_poly2d_point_region_poly2d` (`region_id` ASC, `world_id` ASC) ,
+  CONSTRAINT `fk_region_poly2d_point_region_poly2d`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region_poly2d` (`region_id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+AUTO_INCREMENT = 15
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;

contrib/region_storage_update_20110325.sql

@@ -0,0 +1,106 @@
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL';
+
+ALTER TABLE `region_cuboid` DROP FOREIGN KEY `fk_region_cuboid_region` ;
+
+ALTER TABLE `region_flag` DROP FOREIGN KEY `fk_flags_region1` ;
+
+ALTER TABLE `region_groups` DROP FOREIGN KEY `fk_region_groups_region` ;
+
+ALTER TABLE `region_players` DROP FOREIGN KEY `fk_region_players_user` , DROP FOREIGN KEY `fk_region_players_region` ;
+
+ALTER TABLE `region_poly2d` DROP FOREIGN KEY `fk_region_poly2d_region` ;
+
+ALTER TABLE `region_poly2d_point` DROP FOREIGN KEY `fk_region_poly2d_point_region_poly2d` ;
+
+ALTER TABLE `group` COLLATE = utf8_bin ;
+
+ALTER TABLE `region_cuboid` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , CHANGE COLUMN `min_x` `min_x` BIGINT(20) NOT NULL  AFTER `world_id` , CHANGE COLUMN `min_y` `min_y` BIGINT(20) NOT NULL  AFTER `min_x` , CHANGE COLUMN `max_x` `max_x` BIGINT(20) NOT NULL  AFTER `min_z` , CHANGE COLUMN `max_y` `max_y` BIGINT(20) NOT NULL  AFTER `max_x` , 
+  ADD CONSTRAINT `fk_region_cuboid_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP PRIMARY KEY 
+, ADD PRIMARY KEY (`region_id`, `world_id`) ;
+
+ALTER TABLE `region_flag` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , CHANGE COLUMN `flag` `flag` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL  , 
+  ADD CONSTRAINT `fk_flags_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP INDEX `fk_flags_region` 
+, ADD INDEX `fk_flags_region` (`region_id` ASC, `world_id` ASC) ;
+
+ALTER TABLE `region_groups` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , DROP FOREIGN KEY `fk_region_groups_group` ;
+
+ALTER TABLE `region_groups` 
+  ADD CONSTRAINT `fk_region_groups_group`
+  FOREIGN KEY (`group_id` )
+  REFERENCES `group` (`id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE, 
+  ADD CONSTRAINT `fk_region_groups_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP PRIMARY KEY 
+, ADD PRIMARY KEY (`region_id`, `world_id`, `group_id`) ;
+
+ALTER TABLE `region_players` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , 
+  ADD CONSTRAINT `fk_region_users_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE, 
+  ADD CONSTRAINT `fk_region_users_user`
+  FOREIGN KEY (`user_id` )
+  REFERENCES `user` (`id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP PRIMARY KEY 
+, ADD PRIMARY KEY (`region_id`, `world_id`, `user_id`) 
+, ADD INDEX `fk_region_users_user` (`user_id` ASC) 
+, DROP INDEX `fk_region_players_user` ;
+
+ALTER TABLE `region_poly2d` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , CHANGE COLUMN `min_y` `min_y` INT(11) NOT NULL  AFTER `world_id` , 
+  ADD CONSTRAINT `fk_region_poly2d_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP PRIMARY KEY 
+, ADD PRIMARY KEY (`region_id`, `world_id`) ;
+
+ALTER TABLE `region_poly2d_point` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , CHANGE COLUMN `x` `x` BIGINT(20) NOT NULL  AFTER `world_id` , 
+  ADD CONSTRAINT `fk_region_poly2d_point_region_poly2d`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region_poly2d` (`region_id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP INDEX `fk_region_poly2d_point_region_poly2d` 
+, ADD INDEX `fk_region_poly2d_point_region_poly2d` (`region_id` ASC, `world_id` ASC) ;
+
+ALTER TABLE `user` COLLATE = utf8_bin ;
+
+ALTER TABLE `world` COLLATE = utf8_bin ;
+
+
+UPDATE `region_cuboid` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_flag` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_groups` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_players` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_poly2d` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_poly2d_point` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;

javadoc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="javadoc">
-    <target name="javadoc">
-        <javadoc access="public" author="true" classpath="P:\Projects\Minecraft\Libraries\GroupUsers.jar;P:\Projects\Minecraft\Libraries\jnbt.jar;P:\Projects\Minecraft\hMod\build\classes;P:\Projects\Minecraft\WorldEdit\build\classes;P:\Projects\Minecraft\Libraries\snakeyaml.jar;P:\Projects\Minecraft\Libraries\jopt-simple-3.2.jar;P:\Projects\Minecraft\Libraries\Permissions.jar;C:\Program Files\eclipse\plugins\org.hamcrest.core_1.1.0.v20090501071000.jar;P:\Projects\Minecraft\Libraries\json_simple-1.1.jar;P:\Projects\Minecraft\CraftBukkit\bin;P:\Projects\Minecraft\Libraries\truezip.jar;C:\Program Files\eclipse\plugins\org.junit_4.8.1.v4_8_1_v20100427-1100\junit.jar;P:\Projects\Minecraft\Bukkit\bin;P:\Projects\Minecraft\mc-dev" destdir="doc" doctitle="Worldguard API" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="com.sk89q.worldguard.blacklist,com.sk89q.worldguard.domains,com.sk89q.worldguard.bukkit,com.sk89q.worldguard.protection,com.sk89q.worldguard.util,au.com.bytecode.opencsv,com.sk89q.worldguard,com.sk89q.worldguard.blacklist.loggers,com.sk89q.worldguard.blacklist.events" source="1.6" sourcepath="tests;src" splitindex="true" use="true" version="true"/>
-    </target>
-</project>

permissions_list.txt

@@ -1,68 +0,0 @@
-worldguard.god.other
-worldguard.god.self
-
-worldguard.slay.other
-worldguard.slay.self
-
-worldguard.heal.other
-worldguard.heal.self
-
-worldguard.stack
-
-worldguard.stopfire
-
-worldguard.allowfire
-
-worldguard.locate
-
-worldguard.region.flag.ownregions
-worldguard.region.flag.memberregions
-worldguard.region.flag.foreignregions
-
-worldguard.region.info.ownregions
-worldguard.region.info.memberregions
-worldguard.region.info.foreignregions
-
-worldguard.region.list
-
-worldguard.region.load
-
-worldguard.region.addowner.own
-worldguard.region.addowner.all
-
-worldguard.region.addmember.own
-worldguard.region.addmember.all
-
-worldguard.region.removeowner.own
-worldguard.region.removeowner.all
-
-worldguard.region.removemember.own
-worldguard.region.removemember.all
-
-worldguard.region.save
-
-worldguard.region.setparent.own
-worldguard.region.setparent.all
-
-worldguard.region.priority.own
-worldguard.region.priority.all
-
-worldguard.region.bypass
-
-worldguard.reloadwg
-
-worldguard.region.delete.own
-worldguard.region.delete.all
-
-worldguard.region.define
-
-worldguard.region.claim
-
-worldguard.tpregion
-worldguard.tpregion.spawn
-worldguard.tpregion.override
-
-worldguard.buyregion
-
-worldguard.notify
-worldguard.notify_onenter

plugin.yml

@@ -1,37 +0,0 @@
-name: WorldGuard
-main: com.sk89q.worldguard.bukkit.WorldGuardPlugin
-version: WGVERSIONMACRO
-commands:
-    stopfire:
-        description: Halts all fire spread until it is disabled or the server is restarted
-        usage: /<command>
-    allowfire:
-        description: Re-enables fire spread if he has been disabled with /stopfire
-        usage: /<command>
-    god:
-        description: Enable god mode
-        usage: /<command> [player]
-    ungod:
-        description: Disable god mode
-        usage: /<command> [player]
-    heal:
-        description: Heal yourself or another
-        usage: /<command> [player]
-    slay:
-        description: Slay yourself or another
-        usage: /<command> [player]
-    stack:
-        description: Stacks items in the player's inventory
-        usage: /<command>
-        aliases: ;
-    region:
-        description: Adjust protected regions
-        usage: /<command> <action> ...
-        aliases: [rg, regions]
-    locate:
-        description: Set your compass towards a person
-        usage: /<command> <target>
-    worldguard:
-        description: WorldGuard commands
-        aliases: wg
-        usage: /<command>

pom.xml

@@ -0,0 +1,319 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.sk89q</groupId>
+  <artifactId>worldguard</artifactId>
+  <version>5.8</version>
+  <packaging>jar</packaging>
+  
+  <!-- Project information -->
+  <name>WorldGuard</name>
+  <description>WorldGuard protects your Minecraft servers.</description>
+  <licenses>
+    <license>
+      <name>GNU General Public License 2.0</name>
+      <url>LICENSE.txt</url>
+      <distribution>repo</distribution>
+      <comments>License on all contributions</comments>
+    </license>
+  </licenses>
+  
+  <issueManagement>
+    <system>YouTrack</system>
+    <url>http://youtrack.sk89q.com</url>
+  </issueManagement>
+  
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>http://build.sk89q.com</url>
+  </ciManagement>
+  
+  <scm>
+    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
+    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
+    <url>https://github.com/sk89q/worldguard</url>
+    <tag>5.8</tag>
+  </scm>
+  
+  <mailingLists>
+    <mailingList>
+      <name>Developer Discussion</name>
+      <archive>https://groups.google.com/d/forum/sk-dev-discuss</archive>
+    </mailingList>
+  </mailingLists>
+  
+  <distributionManagement>
+    <site>
+      <id>sk89q-docs-upload</id>
+      <url>ftp://sk89q-maven-deploy/worldguard/</url>
+    </site>
+  </distributionManagement>
+  
+  <properties> <!-- Fix encoding warnings -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
+  <repositories>
+    <repository>
+      <id>sk89q-repo</id>
+      <url>http://maven.sk89q.com/repo/</url>
+    </repository>
+    <repository>
+      <id>zml-repo</id>
+      <url>http://files.zachsthings.com/repo</url>
+    </repository>
+    <repository>
+      <id>bukkit-repo</id>
+      <url>http://repo.bukkit.org/content/groups/public</url>
+    </repository>
+  </repositories>
+  
+  <dependencies>
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>worldedit</artifactId>
+      <version>5.5.3</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.6.2-R0.1-SNAPSHOT</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>commandbook</artifactId>
+      <version>2.1</version>
+      <scope>compile</scope>
+      <type>jar</type>
+      <exclusions>
+        <exclusion>
+          <groupId>com.zachsthings.libcomponents</groupId>
+          <artifactId>libcomponents-bukkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.spout</groupId>
+          <artifactId>spoutapi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.nijikokun</groupId>
+      <artifactId>iconomy</artifactId>
+      <version>5.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.khelekore</groupId>
+      <artifactId>prtree</artifactId>
+      <version>1.5.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>net.sf.opencsv</groupId>
+      <artifactId>opencsv</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    
+    <extensions> <!-- Used for uploading the docs -->
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+         <artifactId>wagon-ftp</artifactId>
+         <version>1.0-beta-6</version>
+      </extension>
+    </extensions>
+
+    <resources>
+      <resource>
+        <targetPath>.</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources/</directory>
+        <includes>
+          <include>plugin.yml</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>defaults/</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources/</directory>
+        <includes>
+          <include>config.yml</include>
+          <include>config_world.yml</include>
+          <include>blacklist.txt</include>
+        </includes>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <archive>
+            <addMavenDescriptor>true</addMavenDescriptor>
+            <manifest>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Class-Path>WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>net.sf.opencsv:opencsv</include>
+                  <include>org.khelekore:prtree</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <configuration>
+          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
+        </configuration>
+        <executions>
+          <execution>
+            <id>release</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.4.1</version>
+        <configuration>
+          <preparationGoals>assembly:assembly</preparationGoals>
+          <goals>assembly:assembly</goals>
+          <tagNameFormat>@{project.version}</tagNameFormat>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <version>2.5</version>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>license</report>
+                    <report>index</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.8.1</version>
+            </plugin>
+          </reportPlugins>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <!-- Attach javadocs and source .jars -->
+    <profile>
+      <id>attach-docs</id>
+      
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.8.1</version>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

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

@@ -1,307 +0,0 @@
-/**
- 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.
- */
-
-package au.com.bytecode.opencsv;
-
-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

@@ -1,282 +0,0 @@
-/**
- 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.
- */
-
-package au.com.bytecode.opencsv;
-
-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

@@ -1,302 +0,0 @@
-/**
- 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.
- */
-
-package au.com.bytecode.opencsv;
-
-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

@@ -1,34 +0,0 @@
-/**
- 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.
- */
-
-package au.com.bytecode.opencsv;
-
-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

@@ -1,185 +0,0 @@
-/**
- 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.
- */
-
-package au.com.bytecode.opencsv;
-
-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/bukkit/BukkitUtil.java

@@ -1,61 +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.bukkit;
-
-import java.util.List;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
-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);
-    }
-
-    public static Location toLocation(World world, Vector vec) {
-        return new Location(world, vec.getX(), vec.getY(), vec.getZ());
-    }
-
-}

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

@@ -1,193 +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.bukkit;
-
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.Blacklist;
-import java.io.File;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.util.config.Configuration;
-
-/**
- * Represents the global configuration and also delegates configuration
- * for individual worlds.
- * 
- * @author sk89q
- * @author Michael
- */
-public class ConfigurationManager {
-
-    /**
-     * Reference to the plugin.
-     */
-    private WorldGuardPlugin plugin;
-    
-    /**
-     * Holds configurations for different worlds.
-     */
-    private Map<String, WorldConfiguration> worlds;
-    
-    /**
-     * List of people with god mode.
-     */
-    private Set<String> hasGodMode = new HashSet<String>();
-    
-    /**
-     * List of people who can breathe underwater.
-     */
-    private Set<String> hasAmphibious = new HashSet<String>();
-    
-    public boolean suppressTickSyncWarnings;
-
-    /**
-     * Construct the object.
-     * 
-     * @param plugin
-     */
-    public ConfigurationManager(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-        this.worlds = new HashMap<String, WorldConfiguration>();
-    }
-
-    /**
-     * Load the configuration.
-     */
-    public void load() {
-        // Create the default configuration file
-        WorldGuardPlugin.createDefaultConfiguration(
-                new File(plugin.getDataFolder(), "config.yml"), "config.yml");
-        
-        Configuration config = plugin.getConfiguration();
-        config.load();
-
-        suppressTickSyncWarnings = config.getBoolean(
-                "suppress-tick-sync-warnings", false);
-
-        // Load configurations for each world
-        for (World world : plugin.getServer().getWorlds()) {
-            get(world);
-        }
-    }
-
-    /**
-     * Unload the configuration.
-     */
-    public void unload() {
-        worlds.clear();
-    }
-
-    /**
-     * Get the configuration for a world.
-     * 
-     * @param world
-     * @return
-     */
-    public WorldConfiguration get(World world) {
-        String worldName = world.getName();
-        WorldConfiguration config = worlds.get(worldName);
-        
-        if (config == null) {
-            config = new WorldConfiguration(plugin, worldName);
-            worlds.put(worldName, config);
-        }
-
-        return config;
-    }
-
-    /**
-     * Forget a player.
-     * 
-     * @param player
-     */
-    public void forgetPlayer(LocalPlayer player) {
-        for (Map.Entry<String, WorldConfiguration> entry
-                : worlds.entrySet()) {
-            
-            // The blacklist needs to forget players
-            Blacklist bl = entry.getValue().getBlacklist();
-            if (bl != null) {
-                bl.forgetPlayer(player);
-            }
-        }
-        
-        hasGodMode.remove(player.getName());
-        hasAmphibious.remove(player.getName());
-    }
-    
-    /**
-     * Enable god mode for a player.
-     * 
-     * @param player
-     */
-    public void enableGodMode(Player player) {
-        hasGodMode.add(player.getName());
-    }
-    
-    /**
-     * Disable god mode for a player.
-     * 
-     * @param player
-     */
-    public void disableGodMode(Player player) {
-        hasGodMode.remove(player.getName());
-    }
-    
-    /**
-     * Check to see if god mode is enabled for a player.
-     * 
-     * @param player
-     * @return 
-     */
-    public boolean hasGodMode(Player player) {
-        return hasGodMode.contains(player.getName());
-    }
-    
-    /**
-     * Enable amphibious mode for a player.
-     * 
-     * @param player
-     */
-    public void enableAmphibiousMode(Player player) {
-        hasAmphibious.add(player.getName());
-    }
-    
-    /**
-     * Disable amphibious mode  for a player.
-     * 
-     * @param player
-     */
-    public void disableAmphibiousMode(Player player) {
-        hasAmphibious.remove(player.getName());
-    }
-    
-    /**
-     * Check to see if amphibious mode  is enabled for a player.
-     * 
-     * @param player
-     * @return 
-     */
-    public boolean hasAmphibiousMode(Player player) {
-        return hasAmphibious.contains(player.getName());
-    }
-}

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

@@ -1,345 +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.bukkit;
-
-import com.sk89q.worldguard.blacklist.Blacklist;
-import com.sk89q.worldguard.blacklist.BlacklistLogger;
-import com.sk89q.worldguard.blacklist.loggers.ConsoleLoggerHandler;
-import com.sk89q.worldguard.blacklist.loggers.DatabaseLoggerHandler;
-import com.sk89q.worldguard.blacklist.loggers.FileLoggerHandler;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.block.Block;
-import org.bukkit.entity.CreatureType;
-import org.bukkit.entity.Player;
-import org.bukkit.util.config.Configuration;
-
-/**
- * Holds the configuration for individual worlds.
- *
- * @author sk89q
- * @author Michael
- */
-public class WorldConfiguration {
-
-    private static final Logger logger = Logger
-            .getLogger("Minecraft.WorldGuard");
-
-    private WorldGuardPlugin plugin;
-
-    private String worldName;
-    private File configFile;
-    private File blacklistFile;
-
-    private Blacklist blacklist;
-    private SignChestProtection chestProtection = new SignChestProtection();
-
-    /* Configuration data start */
-    public boolean fireSpreadDisableToggle;
-    public boolean enforceOneSession;
-    public boolean itemDurability;
-    public boolean classicWater;
-    public boolean simulateSponge;
-    public int spongeRadius;
-    public boolean pumpkinScuba;
-    public boolean redstoneSponges;
-    public boolean noPhysicsGravel;
-    public boolean noPhysicsSand;
-    public boolean allowPortalAnywhere;
-    public Set<Integer> preventWaterDamage;
-    public boolean blockTNT;
-    public boolean blockLighter;
-    public boolean disableFireSpread;
-    public Set<Integer> disableFireSpreadBlocks;
-    public boolean preventLavaFire;
-    public Set<Integer> allowedLavaSpreadOver;
-    public boolean blockCreeperExplosions;
-    public boolean blockCreeperBlockDamage;
-    public int loginProtection;
-    public int spawnProtection;
-    public boolean kickOnDeath;
-    public boolean exactRespawn;
-    public boolean teleportToHome;
-    public boolean disableContactDamage;
-    public boolean disableFallDamage;
-    public boolean disableLavaDamage;
-    public boolean disableFireDamage;
-    public boolean disableLightningDamage;
-    public boolean disableDrowningDamage;
-    public boolean disableSuffocationDamage;
-    public boolean teleportOnSuffocation;
-    public boolean disableVoidDamage;
-    public boolean teleportOnVoid;
-    public boolean useRegions;
-    public boolean highFreqFlags;
-    public int regionWand = 287;
-    public Set<CreatureType> blockCreatureSpawn;
-    public boolean useiConomy;
-    public boolean buyOnClaim;
-    public double buyOnClaimPrice;
-    public int maxClaimVolume;
-    public boolean claimOnlyInsideExistingRegions;
-    public int maxRegionCountPerPlayer;
-    public boolean antiWolfDumbness;
-    public boolean signChestProtection;
-    public boolean removeInfiniteStacks;
-    public boolean disableCreatureCropTrampling;
-    public boolean disablePlayerCropTrampling;
-    public boolean preventLightningFire;
-    public Set<Integer> disallowedLightningBlocks;
-    public boolean disableThunder;
-    public boolean disableWeather;
-    public boolean alwaysRaining;
-    public boolean alwaysThundering;
-    public boolean disablePigZap;
-    public boolean disableCreeperPower;
-
-    /* Configuration data end */
-
-    /**
-     * Construct the object.
-     *
-     * @param plugin
-     * @param worldName
-     */
-    public WorldConfiguration(WorldGuardPlugin plugin, String worldName) {
-        File baseFolder = new File(plugin.getDataFolder(), "worlds/" + worldName);
-        configFile = new File(baseFolder, "config.yml");
-        blacklistFile = new File(baseFolder, "blacklist.txt");
-
-        this.plugin = plugin;
-        this.worldName = worldName;
-
-        WorldGuardPlugin.createDefaultConfiguration(configFile, "config_world.yml");
-        WorldGuardPlugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");
-
-        loadConfiguration();
-
-        logger.info("WorldGuard: Loaded configuration for world '" + worldName + '"');
-    }
-
-    /**
-     * Load the configuration.
-     */
-    private void loadConfiguration() {
-        Configuration config = new Configuration(this.configFile);
-        config.load();
-
-        enforceOneSession = config.getBoolean("protection.enforce-single-session", true);
-        itemDurability = config.getBoolean("protection.item-durability", true);
-        removeInfiniteStacks = config.getBoolean("protection.remove-infinite-stacks", false);
-
-        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;
-        redstoneSponges = config.getBoolean("simulation.sponge.redstone", false);
-
-        pumpkinScuba = config.getBoolean("pumpkin-scuba", false);
-
-        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);
-        blockCreeperBlockDamage = config.getBoolean("mobs.block-creeper-block-damage", false);
-        antiWolfDumbness = config.getBoolean("mobs.anti-wolf-dumbness", 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);
-        disableLightningDamage = config.getBoolean("player-damage.disable-lightning-damage", false);
-        disableDrowningDamage = config.getBoolean("player-damage.disable-drowning-damage", false);
-        disableSuffocationDamage = config.getBoolean("player-damage.disable-suffocation-damage", false);
-        disableContactDamage = config.getBoolean("player-damage.disable-contact-damage", false);
-        teleportOnSuffocation = config.getBoolean("player-damage.teleport-on-suffocation", false);
-        disableVoidDamage = config.getBoolean("player-damage.disable-void-damage", false);
-        teleportOnVoid = config.getBoolean("player-damage.teleport-on-void-falling", false);
-
-        signChestProtection = config.getBoolean("chest-protection.enable", false);
-
-        disableCreatureCropTrampling = config.getBoolean("crops.disable-creature-trampling", false);
-        disablePlayerCropTrampling = config.getBoolean("crops.disable-player-trampling", false);
-
-        disallowedLightningBlocks = new HashSet<Integer>(config.getIntList("weather.prevent-lightning-strike-blocks", null));
-        preventLightningFire = config.getBoolean("weather.disable-lightning-strike-fire", false);
-        disableThunder = config.getBoolean("weather.disable-thunderstorm", false);
-        disableWeather = config.getBoolean("weather.disable-weather", false);
-        disablePigZap = config.getBoolean("weather.disable-pig-zombification", false);
-        disableCreeperPower = config.getBoolean("weather.disable-powered-creepers", false);
-        alwaysRaining = config.getBoolean("weather.always-raining", false);
-        alwaysThundering = config.getBoolean("weather.always-thundering", false);
-
-        useRegions = config.getBoolean("regions.enable", true);
-        highFreqFlags = config.getBoolean("regions.high-frequency-flags", false);
-        regionWand = config.getInt("regions.wand", 287);
-        maxClaimVolume = config.getInt("regions.max-claim-volume", 30000);
-        claimOnlyInsideExistingRegions = config.getBoolean("regions.claim-only-inside-existing-regions", false);
-        maxRegionCountPerPlayer = config.getInt("regions.max-region-count-per-player", 7);
-
-        useiConomy = config.getBoolean("iconomy.enable", false);
-        buyOnClaim = config.getBoolean("iconomy.buy-on-claim", false);
-        buyOnClaimPrice = config.getDouble("iconomy.buy-on-claim-price", 1.0);
-
-        blockCreatureSpawn = new HashSet<CreatureType>();
-        for (String creatureName : config.getStringList("mobs.block-creature-spawn", null)) {
-            CreatureType creature = CreatureType.fromName(creatureName);
-
-            if (creature == null) {
-                logger.warning("WorldGuard: Unknown mob type '" + creatureName + "'");
-            } else {
-                blockCreatureSpawn.add(creature);
-            }
-        }
-
-        boolean useBlacklistAsWhitelist = config.getBoolean("blacklist.use-as-whitelist", false);
-
-        // 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(useBlacklistAsWhitelist, plugin);
-            blist.load(blacklistFile);
-
-            // 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, worldName));
-                }
-
-                if (logConsole) {
-                    blacklistLogger.addHandler(new ConsoleLoggerHandler(worldName));
-                }
-
-                if (logFile) {
-                    FileLoggerHandler handler =
-                            new FileLoggerHandler(logFilePattern, logFileCacheSize, worldName);
-                    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: (" + worldName + ") Single session is enforced."
-                    : "WorldGuard: (" + worldName + ") Single session is NOT ENFORCED.");
-            logger.log(Level.INFO, blockTNT
-                    ? "WorldGuard: (" + worldName + ") TNT ignition is blocked."
-                    : "WorldGuard: (" + worldName + ") TNT ignition is PERMITTED.");
-            logger.log(Level.INFO, blockLighter
-                    ? "WorldGuard: (" + worldName + ") Lighters are blocked."
-                    : "WorldGuard: (" + worldName + ") Lighters are PERMITTED.");
-            logger.log(Level.INFO, preventLavaFire
-                    ? "WorldGuard: (" + worldName + ") Lava fire is blocked."
-                    : "WorldGuard: (" + worldName + ") Lava fire is PERMITTED.");
-
-            if (disableFireSpread) {
-                logger.log(Level.INFO, "WorldGuard: (" + worldName + ") All fire spread is disabled.");
-            } else {
-                if (disableFireSpreadBlocks.size() > 0) {
-                    logger.log(Level.INFO, "WorldGuard: (" + worldName
-                            + ") Fire spread is limited to "
-                            + disableFireSpreadBlocks.size() + " block types.");
-                } else {
-                    logger.log(Level.INFO, "WorldGuard: (" + worldName
-                            + ") Fire spread is UNRESTRICTED.");
-                }
-            }
-        }
-    }
-
-    public Blacklist getBlacklist() {
-        return this.blacklist;
-    }
-
-    public String getWorldName() {
-        return this.worldName;
-    }
-    
-    public boolean isChestProtected(Block block, Player player) {
-        if (!signChestProtection) {
-            return false;
-        }
-        if (plugin.hasPermission(player, "worldguard.chest-protection.override")) {
-            return false;
-        }
-        return chestProtection.isProtected(block, player);
-    }
-    
-    public boolean isChestProtected(Block block) {
-        if (!signChestProtection) {
-            return false;
-        }
-        return chestProtection.isProtected(block, null);
-    }
-
-}

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

@@ -1,675 +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.bukkit;
-
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.block.Block;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-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;
-    }
-
-    public void registerEvents() {
-
-        PluginManager pm = plugin.getServer().getPluginManager();
-
-        pm.registerEvent(Event.Type.BLOCK_DAMAGE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.BLOCK_BREAK, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.BLOCK_FROMTO, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.BLOCK_IGNITE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.BLOCK_PHYSICS, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.BLOCK_PLACE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.BLOCK_BURN, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.SIGN_CHANGE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.REDSTONE_CHANGE, this, Priority.High, plugin);
-    }
-    
-    protected WorldConfiguration getWorldConfig(World world) {
-        return plugin.getGlobalConfiguration().get(world);
-    }
-    
-    protected WorldConfiguration getWorldConfig(Player player) {
-        return plugin.getGlobalConfiguration().get(player.getWorld());
-    }
-    
-    /**
-     * Called when a block is damaged.
-     */
-    @Override
-    public void onBlockDamage(BlockDamageEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        Block blockDamaged = event.getBlock();
-
-        // Cake are damaged and not broken when they are eaten, so we must
-        // handle them a bit separately
-        if (blockDamaged.getType() == Material.CAKE_BLOCK) {
-            if (!plugin.getGlobalRegionManager().canBuild(player, blockDamaged)) {
-                player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-    
-    /**
-     * Called when a block is broken.
-     */
-    @Override
-    public void onBlockBreak(BlockBreakEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        WorldConfiguration wcfg = getWorldConfig(player);
-
-        if (!wcfg.itemDurability) {
-            ItemStack held = player.getItemInHand();
-            if (held.getTypeId() > 0) {
-                held.setDurability((short) -1);
-                player.setItemInHand(held);
-            }
-        }
-
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlock())) {
-            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
-                    toVector(event.getBlock()),
-                    event.getBlock().getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (!wcfg.getBlacklist().check(
-                    new DestroyWithBlacklistEvent(plugin.wrapPlayer(player),
-                    toVector(event.getBlock()),
-                    player.getItemInHand().getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-        
-        if (wcfg.isChestProtected(event.getBlock(), player)) {
-            player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
-            event.setCancelled(true);
-            return;
-        }
-    }
-
-    /**
-     * Called when fluids flow.
-     */
-    @Override
-    public void onBlockFromTo(BlockFromToEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        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;
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (wcfg.simulateSponge && isWater) {
-            int ox = blockTo.getX();
-            int oy = blockTo.getY();
-            int oz = blockTo.getZ();
-
-            for (int cx = -wcfg.spongeRadius; cx <= wcfg.spongeRadius; cx++) {
-                for (int cy = -wcfg.spongeRadius; cy <= wcfg.spongeRadius; cy++) {
-                    for (int cz = -wcfg.spongeRadius; cz <= wcfg.spongeRadius; cz++) {
-                        Block sponge = world.getBlockAt(ox + cx, oy + cy, oz + cz);
-                        if (sponge.getTypeId() == 19
-                                && (!wcfg.redstoneSponges || !sponge.isBlockIndirectlyPowered())) {
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-
-        /*if (plugin.classicWater && isWater) {
-        int blockBelow = blockFrom.getRelative(0, -1, 0).getTypeId();
-        if (blockBelow != 0 && blockBelow != 8 && blockBelow != 9) {
-        blockFrom.setTypeId(9);
-        if (blockTo.getTypeId() == 0) {
-        blockTo.setTypeId(9);
-        }
-        return;
-        }
-        }*/
-
-        // Check the fluid block (from) whether it is air.
-        // If so and the target block is protected, cancel the event
-        if (wcfg.preventWaterDamage.size() > 0) {
-            int targetId = blockTo.getTypeId();
-            
-            if ((blockFrom.getTypeId() == 0 || isWater) && 
-                    wcfg.preventWaterDamage.contains(targetId)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.allowedLavaSpreadOver.size() > 0 && isLava) {
-            int targetId = blockTo.getRelative(0, -1, 0).getTypeId();
-            
-            if (!wcfg.allowedLavaSpreadOver.contains(targetId)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.highFreqFlags && isWater
-                && !plugin.getGlobalRegionManager().allows(DefaultFlag.WATER_FLOW,
-                blockFrom.getLocation())) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.highFreqFlags && isLava
-                && !plugin.getGlobalRegionManager().allows(DefaultFlag.LAVA_FLOW,
-                blockFrom.getLocation())) {
-            event.setCancelled(true);
-            return;
-        }
-    }
-
-    /**
-     * Called when a block gets ignited.
-     */
-    @Override
-    public void onBlockIgnite(BlockIgniteEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        IgniteCause cause = event.getCause();
-        Block block = event.getBlock();
-        World world = block.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        boolean isFireSpread = cause == IgniteCause.SPREAD;
-
-        if (wcfg.preventLightningFire && cause == IgniteCause.LIGHTNING) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.preventLavaFire && cause == IgniteCause.LAVA) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.disableFireSpread && isFireSpread) {
-            event.setCancelled(true);
-            return;
-        }
-        /*
-        if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL) {
-            event.setCancelled(true);
-            return;
-        }
-        */
-        if (wcfg.fireSpreadDisableToggle && isFireSpread) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.disableFireSpreadBlocks.size() > 0 && isFireSpread) {
-            int x = block.getX();
-            int y = block.getY();
-            int z = block.getZ();
-
-            if (wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y - 1, z))
-                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x + 1, y, z))
-                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x - 1, y, z))
-                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z - 1))
-                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z + 1))) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-        
-        if (wcfg.useRegions) {
-            Vector pt = toVector(block);
-            Player player = event.getPlayer();
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-            if (player != null && !plugin.getGlobalRegionManager().hasBypass(player, world)) {
-                LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-                if (cause == IgniteCause.FLINT_AND_STEEL
-                        && !set.canBuild(localPlayer)) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (cause == IgniteCause.FLINT_AND_STEEL
-                        && !set.allows(DefaultFlag.LIGHTER)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
-            if (wcfg.highFreqFlags && isFireSpread && set.allows(DefaultFlag.FIRE_SPREAD)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.highFreqFlags && cause == IgniteCause.LAVA
-                    && !set.allows(DefaultFlag.LAVA_FIRE)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-    }
-
-    /**
-     * Called when a block is destroyed from burning
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onBlockBurn(BlockBurnEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (wcfg.disableFireSpread) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.fireSpreadDisableToggle) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.disableFireSpreadBlocks.size() > 0) {
-            Block block = event.getBlock();
-
-            if (wcfg.disableFireSpreadBlocks.contains(block.getTypeId())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Called when block physics occurs
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onBlockPhysics(BlockPhysicsEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        int id = event.getChangedTypeId();
-
-        if (id == 13 && wcfg.noPhysicsGravel) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (id == 12 && wcfg.noPhysicsSand) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (id == 90 && wcfg.allowPortalAnywhere) {
-            event.setCancelled(true);
-            return;
-        }
-    }
-
-    /**
-     * Called when a player places a block
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onBlockPlace(BlockPlaceEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        Block blockPlaced = event.getBlock();
-        Player player = event.getPlayer();
-        World world = blockPlaced.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().canBuild(player, blockPlaced.getLocation())) {
-                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new BlockPlaceBlacklistEvent(plugin.wrapPlayer(player), toVector(blockPlaced),
-                    blockPlaced.getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.simulateSponge && blockPlaced.getTypeId() == 19) {
-            if (wcfg.redstoneSponges && blockPlaced.isBlockIndirectlyPowered()) {
-                return;
-            }
-
-            int ox = blockPlaced.getX();
-            int oy = blockPlaced.getY();
-            int oz = blockPlaced.getZ();
-
-            clearSpongeWater(world, ox, oy, oz);
-        }
-    }
-
-    /**
-     * Called when redstone changes
-     * From: the source of the redstone change
-     * To: The redstone dust that changed
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onBlockRedstoneChange(BlockRedstoneEvent event) {
-
-        Block blockTo = event.getBlock();
-        World world = blockTo.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.simulateSponge && wcfg.redstoneSponges) {
-            int ox = blockTo.getX();
-            int oy = blockTo.getY();
-            int oz = blockTo.getZ();
-
-            for (int cx = -1; cx <= 1; cx++) {
-                for (int cy = -1; cy <= 1; cy++) {
-                    for (int cz = -1; cz <= 1; cz++) {
-                        Block sponge = world.getBlockAt(ox + cx, oy + cy, oz + cz);
-                        if (sponge.getTypeId() == 19
-                                && sponge.isBlockIndirectlyPowered()) {
-                            clearSpongeWater(world, ox + cx, oy + cy, oz + cz);
-                        } else if (sponge.getTypeId() == 19
-                                && !sponge.isBlockIndirectlyPowered()) {
-                            addSpongeWater(world, ox + cx, oy + cy, oz + cz);
-                        }
-                    }
-                }
-            }
-
-            return;
-        }
-    }
-
-    /**
-     * Called when a sign is changed.
-     */
-    @Override
-    public void onSignChange(SignChangeEvent event) {
-
-        Player player = event.getPlayer();
-        WorldConfiguration wcfg = getWorldConfig(player);
-        
-        if (wcfg.signChestProtection) {
-            if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
-                if (event.getBlock().getType() != Material.SIGN_POST) {
-                    player.sendMessage(ChatColor.RED
-                            + "The [Lock] sign must be a sign post, not a wall sign.");
-
-                    dropSign(event.getBlock());
-                    event.setCancelled(true);
-                    return;
-                } else if (!event.getLine(1).equalsIgnoreCase(player.getName())) {
-                    player.sendMessage(ChatColor.RED
-                            + "The first owner line must be your name.");
-
-                    dropSign(event.getBlock());
-                    event.setCancelled(true);
-                    return;
-                } else {
-                    event.setLine(0, "[Lock]");
-                    player.sendMessage(ChatColor.YELLOW
-                            + "A chest or double chest above is now protected.");
-                }
-            }
-        } else {
-            if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
-                player.sendMessage(ChatColor.RED
-                        + "WorldGuard's sign chest protection is disabled.");
-                
-                dropSign(event.getBlock());
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-    
-    /**
-     * Drops a sign item and removes a sign.
-     * 
-     * @param block
-     */
-    private void dropSign(Block block) {
-        block.setTypeId(0);
-        block.getWorld().dropItemNaturally(block.getLocation(),
-                new ItemStack(Material.SIGN));
-    }
-
-    /**
-     * Remove water around a sponge.
-     * 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     */
-    private void clearSpongeWater(World world, int ox, int oy, int oz) {
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        for (int cx = -wcfg.spongeRadius; cx <= wcfg.spongeRadius; cx++) {
-            for (int cy = -wcfg.spongeRadius; cy <= wcfg.spongeRadius; cy++) {
-                for (int cz = -wcfg.spongeRadius; cz <= wcfg.spongeRadius; cz++) {
-                    if (isBlockWater(world, ox + cx, oy + cy, oz + cz)) {
-                        world.getBlockAt(ox + cx, oy + cy, oz + cz).setTypeId(0);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Add water around a sponge.
-     * 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     */
-    private void addSpongeWater(World world, int ox, int oy, int oz) {
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        // The negative x edge
-        int cx = ox - wcfg.spongeRadius - 1;
-        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx + 1, cy, cz);
-                }
-            }
-        }
-
-        // The positive x edge
-        cx = ox + wcfg.spongeRadius + 1;
-        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx - 1, cy, cz);
-                }
-            }
-        }
-
-        // The negative y edge
-        int cy = oy - wcfg.spongeRadius - 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy + 1, cz);
-                }
-            }
-        }
-
-        // The positive y edge
-        cy = oy + wcfg.spongeRadius + 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy - 1, cz);
-                }
-            }
-        }
-
-        // The negative z edge
-        int cz = oz - wcfg.spongeRadius - 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy, cz + 1);
-                }
-            }
-        }
-
-        // The positive z edge
-        cz = oz + wcfg.spongeRadius + 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy, cz - 1);
-                }
-            }
-        }
-    }
-
-    /**
-     * Sets the given block to fluid water.
-     * Used by addSpongeWater()
-     * 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     */
-    private void setBlockToWater(World world, int ox, int oy, int oz) {
-        Block block = world.getBlockAt(ox, oy, oz);
-        int id = block.getTypeId();
-        if (id == 0) {
-            block.setTypeId(8);
-        }
-    }
-
-    /**
-     * Checks if the given block is water
-     * 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     */
-    private boolean isBlockWater(World world, int ox, int oy, int oz) {
-        Block block = world.getBlockAt(ox, oy, oz);
-        int id = block.getTypeId();
-        if (id == 8 || id == 9) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}

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

@@ -1,469 +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.bukkit;
-
-import org.bukkit.block.Block;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.*;
-import org.bukkit.event.entity.*;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockType;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
-
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-
-public class WorldGuardEntityListener extends EntityListener {
-
-    /**
-     * Plugin.
-     */
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Construct the object;
-     * 
-     * @param plugin
-     */
-    public WorldGuardEntityListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    public void registerEvents() {
-
-        PluginManager pm = plugin.getServer().getPluginManager();
-
-        pm.registerEvent(Event.Type.ENTITY_DAMAGE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.ENTITY_EXPLODE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.CREATURE_SPAWN, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.ENTITY_INTERACT, this, Priority.High, plugin);
-    }
-
-    @Override
-    public void onEntityInteract(EntityInteractEvent event) {
-        //bukkit doesn't actually throw this event yet, someone add a ticket to leaky
-        Entity entity = event.getEntity();
-        Block block = event.getBlock();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(entity.getWorld());
-
-        if (block.getType() == Material.SOIL) {
-            if (entity instanceof Creature && wcfg.disableCreatureCropTrampling) {
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
-
-        Entity defender = event.getEntity();
-        DamageCause type = event.getCause();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(defender.getWorld());
-
-        if (defender instanceof Wolf) {
-            if (wcfg.antiWolfDumbness && !(type == DamageCause.VOID)) {
-                event.setCancelled(true);
-                return;
-            }
-        } else if (defender instanceof Player) {
-            Player player = (Player) defender;
-
-            if (cfg.hasGodMode(player)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.disableLavaDamage && type == DamageCause.LAVA) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.disableContactDamage && type == DamageCause.CONTACT) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.teleportOnVoid && type == DamageCause.VOID) {
-                findFreePosition(player);
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.disableVoidDamage && type == DamageCause.VOID) {
-                event.setCancelled(true);
-                return;
-            }
-
-        }
-    }
-
-    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
-        Entity attacker = event.getDamager();
-        Entity defender = event.getEntity();
-
-        if (defender instanceof Player) {
-            Player player = (Player) defender;
-
-            ConfigurationManager cfg = plugin.getGlobalConfiguration();
-            WorldConfiguration wcfg = cfg.get(player.getWorld());
-            
-            if (cfg.hasGodMode(player)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.disableLightningDamage && event.getCause() == DamageCause.LIGHTNING) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (attacker != null && attacker instanceof Player) {
-                if (wcfg.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-
-                    if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP)) {
-                        ((Player) attacker).sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-
-            if (attacker != null && attacker instanceof LivingEntity
-                    && !(attacker instanceof Player)) {
-                if (attacker instanceof Creeper && wcfg.blockCreeperExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-                    if (!set.allows(DefaultFlag.MOB_DAMAGE)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-
-                    if (attacker instanceof Creeper) {
-                        if (!set.allows(DefaultFlag.CREEPER_EXPLOSION)) {
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-                }
-
-            }
-        }
-    }
-
-    public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
-        Entity defender = event.getEntity();
-        Entity attacker = event.getDamager();
-
-        if (defender instanceof Player) {
-            Player player = (Player) defender;
-
-            ConfigurationManager cfg = plugin.getGlobalConfiguration();
-            WorldConfiguration wcfg = cfg.get(player.getWorld());
-            
-            if (cfg.hasGodMode(player)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (attacker != null && attacker instanceof Player) {
-                if (wcfg.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-
-                    if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP)) {
-                        ((Player) attacker).sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-            if (attacker != null && attacker instanceof Skeleton) {
-                if (wcfg.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-
-                    if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.MOB_DAMAGE)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public void onEntityDamage(EntityDamageEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        if (event instanceof EntityDamageByProjectileEvent) {
-            this.onEntityDamageByProjectile((EntityDamageByProjectileEvent) event);
-            return;
-        } else if (event instanceof EntityDamageByEntityEvent) {
-            this.onEntityDamageByEntity((EntityDamageByEntityEvent) event);
-            return;
-        } else if (event instanceof EntityDamageByBlockEvent) {
-            this.onEntityDamageByBlock((EntityDamageByBlockEvent) event);
-            return;
-        }
-
-        Entity defender = event.getEntity();
-        DamageCause type = event.getCause();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(defender.getWorld());
-
-        if (defender instanceof Wolf) {
-            if (wcfg.antiWolfDumbness) {
-                event.setCancelled(true);
-                return;
-            }
-        } else if (defender instanceof Player) {
-            Player player = (Player) defender;
-
-            if (cfg.hasGodMode(player)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (type == DamageCause.DROWNING && cfg.hasAmphibiousMode(player)) {
-                player.setRemainingAir(player.getMaximumAir());
-                event.setCancelled(true);
-                return;
-            }
-
-            if (type == DamageCause.DROWNING && wcfg.pumpkinScuba
-                    && (player.getInventory().getHelmet().getType() == Material.PUMPKIN
-                    || player.getInventory().getHelmet().getType() == Material.JACK_O_LANTERN)) {
-                player.setRemainingAir(player.getMaximumAir());
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.disableFallDamage && type == DamageCause.FALL) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.disableFireDamage && (type == DamageCause.FIRE
-                    || type == DamageCause.FIRE_TICK)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.disableDrowningDamage && type == DamageCause.DROWNING) {
-                player.setRemainingAir(player.getMaximumAir());
-                event.setCancelled(true);
-                return;
-            }
-
-           if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
-                findFreePosition(player);
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.disableSuffocationDamage && type == DamageCause.SUFFOCATION) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    @Override
-    public void onEntityExplode(EntityExplodeEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        Location l = event.getLocation();
-        World world = l.getWorld();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (event.getEntity() instanceof LivingEntity) {
-            if (wcfg.blockCreeperBlockDamage) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.blockCreeperExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.useRegions) {
-                Vector pt = toVector(l);
-                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.CREEPER_EXPLOSION)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        } else { // Shall assume that this is TNT
-            if (wcfg.blockTNT) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.useRegions) {
-                Vector pt = toVector(l);
-                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.TNT)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-        
-        if (wcfg.signChestProtection) {
-            for (Block block : event.blockList()) {
-                if (wcfg.isChestProtected(block)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onCreatureSpawn(CreatureSpawnEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
-
-        //CreatureType creaType = (CreatureType) CreatureType.valueOf(event.getMobType().toString());
-        CreatureType creaType = event.getCreatureType();
-        Boolean cancelEvent = false;
-
-        if (wcfg.blockCreatureSpawn.contains(creaType)) {
-            cancelEvent = true;
-        }
-        
-        Location eventLoc = event.getLocation();
-        
-        if (wcfg.useRegions) {
-            Vector pt = toVector(eventLoc);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(eventLoc.getWorld());
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-            if (!set.allows(DefaultFlag.MOB_SPAWNING)) {
-            	cancelEvent = true;
-            }
-        }
-        
-        // TODO: Monsters and stuff
-/*
-        if (wcfg.useRegions) {
-            Vector pt = toVector(event.getEntity().getLocation());
-            RegionManager mgr = plugin.getGlobalRegionManager().get(event.getEntity().getWorld().getName());
-
-            Boolean flagValue = mgr.getApplicableRegions(pt).getFlag(DefaultFlag.DENY_SPAWN).getValue("").contains(creaType.getName());
-            if (flagValue != null) {
-                if (flagValue) {
-                    cancelEvent = true;
-                } else {
-                    cancelEvent = false;
-                }
-            }
-        }*/
-
-        if (cancelEvent) {
-            event.setCancelled(true);
-            return;
-        }
-    }
-
-    /**
-     * Find a position for the player to stand that is not inside a block.
-     * Blocks above the player will be iteratively tested until there is
-     * a series of two free blocks. The player will be teleported to
-     * that free position.
-     *
-     * @param player
-     */
-    public void findFreePosition(Player player) {
-        Location loc = player.getLocation();
-        int x = loc.getBlockX();
-        int y = Math.max(0, loc.getBlockY());
-        int origY = y;
-        int z = loc.getBlockZ();
-        World world = player.getWorld();
-
-        byte free = 0;
-
-        while (y <= 129) {
-            if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) {
-                free++;
-            } else {
-                free = 0;
-            }
-
-            if (free == 2) {
-                if (y - 1 != origY || y == 1) {
-                    loc.setX(x + 0.5);
-                    loc.setY(y);
-                    loc.setZ(z + 0.5);
-                    if (y <= 2 && world.getBlockAt(x,0,z).getType() == Material.AIR) {
-                        world.getBlockAt(x,0,z).setTypeId(20);
-                        loc.setY(2);
-                    }
-                    player.setFallDistance(0F);
-                    player.teleport(loc);
-                }
-                return;
-            }
-
-            y++;
-        }
-    }
-}

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

@@ -1,745 +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.bukkit;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-import java.util.Iterator;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.*;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.PluginManager;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag.RegionGroup;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-
-/**
- * Handles all events thrown in relation to a Player
- */
-public class WorldGuardPlayerListener extends PlayerListener {
-
-    /**
-     * Plugin.
-     */
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Construct the object;
-     * 
-     * @param plugin
-     */
-    public WorldGuardPlayerListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-
-    public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
-
-        pm.registerEvent(Event.Type.PLAYER_INTERACT, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_PICKUP_ITEM, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_JOIN, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.PLAYER_LOGIN, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.PLAYER_QUIT, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.PLAYER_BUCKET_FILL, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_BUCKET_EMPTY, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_RESPAWN, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_ITEM_HELD, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_BED_ENTER, this, Priority.High, plugin);
-    }
-
-    /**
-     * Called when a player interacts with an item.
-     * 
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            handleBlockRightClick(event);
-        } else if (event.getAction() == Action.RIGHT_CLICK_AIR) {
-            handleAirRightClick(event);
-        } else if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
-            handleBlockLeftClick(event);
-        } else if (event.getAction() == Action.LEFT_CLICK_AIR) {
-            handleAirLeftClick(event);
-        } else if (event.getAction() == Action.PHYSICAL) {
-            handlePhysicalInteract(event);
-        }
-    }
-
-    /**
-     * Called when a player left clicks air.
-     *
-     * @param event
-     */
-    public void handleAirLeftClick(PlayerInteractEvent event) {
-         //I don't think we have to do anything here yet.
-         return;
-    }
-
-    /**
-     * Called when a player left clicks a block.
-     *
-     * @param event
-     */
-    public void handleBlockLeftClick(PlayerInteractEvent event) {
-        if (event.isCancelled()) return;
-
-        Player player = event.getPlayer();
-        Block block = event.getClickedBlock();
-        Material type = block.getType();
-        World world = player.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.useRegions) {
-            Vector pt = toVector(block);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-            LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-            if (type == Material.STONE_BUTTON
-                  || type == Material.LEVER
-                  || type == Material.WOODEN_DOOR
-                  || type == Material.NOTE_BLOCK) {
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.allows(DefaultFlag.USE)
-                        && !set.canBuild(localPlayer)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     * Called when a player right clicks air.
-     * 
-     * @param event 
-     */
-    public void handleAirRightClick(PlayerInteractEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        World world = player.getWorld();
-        ItemStack item = player.getItemInHand();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                            toVector(player.getLocation()),
-                    item.getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-    
-    /**
-     * Called when a player right clicks a block.
-     * 
-     * @param event 
-     */
-    public void handleBlockRightClick(PlayerInteractEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        Block block = event.getClickedBlock();
-        World world = block.getWorld();
-        Material type = block.getType();
-        Player player = event.getPlayer();
-        ItemStack item = player.getItemInHand();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.blockLighter && item.getType() == Material.FLINT_AND_STEEL) {
-            if (!plugin.hasPermission(player, "worldguard.lighter.override")) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.useRegions) {
-            Vector pt = toVector(block);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-            LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-            if (item.getTypeId() == wcfg.regionWand) {
-                if (set.size() > 0) {
-                    player.sendMessage(ChatColor.YELLOW + "Can you build? "
-                            + (set.canBuild(localPlayer) ? "Yes" : "No"));
-
-                    StringBuilder str = new StringBuilder();
-                    for (Iterator<ProtectedRegion> it = set.iterator(); it.hasNext();) {
-                        str.append(it.next().getId());
-                        if (it.hasNext()) {
-                            str.append(", ");
-                        }
-                    }
-
-                    player.sendMessage(ChatColor.YELLOW + "Applicable regions: " + str.toString());
-                } else {
-                    player.sendMessage(ChatColor.YELLOW + "WorldGuard: No defined regions here!");
-                }
-
-                event.setCancelled(true);
-                return;
-            }
-
-            if (item.getType() == Material.FLINT_AND_STEEL) {
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                    && !set.allows(DefaultFlag.LIGHTER)
-                    && !plugin.hasPermission(player, "worldguard.lighter.override")) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
-            if (type == Material.CHEST
-                    || type == Material.JUKEBOX //stores the (arguably) most valuable item
-                    || type == Material.DISPENSER
-                    || type == Material.FURNACE
-                    || type == Material.BURNING_FURNACE) {
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.allows(DefaultFlag.CHEST_ACCESS)
-                        && !set.canBuild(localPlayer)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to open that in this area.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-    
-            if (type == Material.LEVER
-                   || type == Material.STONE_BUTTON
-                   || type == Material.NOTE_BLOCK
-                   || type == Material.DIODE_BLOCK_OFF
-                   || type == Material.DIODE_BLOCK_ON
-                   || type == Material.WOODEN_DOOR
-                   || type == Material.WORKBENCH) {
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.allows(DefaultFlag.USE)
-                        && !set.canBuild(localPlayer)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
-            if (type == Material.CAKE_BLOCK) {
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            
-            if ((type == Material.RAILS || type == Material.POWERED_RAIL || type == Material.DETECTOR_RAIL)
-                   && item.getType() == Material.MINECART) {
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)
-                        && !set.allows(DefaultFlag.PLACE_VEHICLE)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            
-            if (item.getType() == Material.BOAT) {
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)
-                        && !set.allows(DefaultFlag.PLACE_VEHICLE)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
-                    item.getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-            
-            if (!wcfg.getBlacklist().check(
-                    new BlockInteractBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
-                    block.getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if ((block.getType() == Material.CHEST
-                || block.getType() == Material.DISPENSER
-                || block.getType() == Material.FURNACE
-                || block.getType() == Material.BURNING_FURNACE)) {
-            
-            if (wcfg.isChestProtected(block, player)) {
-                player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        /*if (wcfg.useRegions && wcfg.useiConomy && cfg.getiConomy() != null
-                    && (type == Material.SIGN_POST || type == Material.SIGN || type == Material.WALL_SIGN)) {
-            BlockState block = blockClicked.getState();
-
-            if (((Sign)block).getLine(0).equalsIgnoreCase("[WorldGuard]")
-                    && ((Sign)block).getLine(1).equalsIgnoreCase("For sale")) {
-                String regionId = ((Sign)block).getLine(2);
-                //String regionComment = ((Sign)block).getLine(3);
-
-                if (regionId != null && regionId != "") {
-                    RegionManager mgr = cfg.getWorldGuardPlugin().getGlobalRegionManager().get(player.getWorld().getName());
-                    ProtectedRegion region = mgr.getRegion(regionId);
-
-                    if (region != null) {
-                        RegionFlags flags = region.getFlags();
-
-                        if (flags.getBooleanFlag(DefaultFlag.BUYABLE).getValue(false)) {
-                            if (iConomy.getBank().hasAccount(player.getName())) {
-                                Account account = iConomy.getBank().getAccount(player.getName());
-                                double balance = account.getBalance();
-                                double regionPrice = flags.getDoubleFlag(DefaultFlag.PRICE).getValue();
-
-                                if (balance >= regionPrice) {
-                                    account.subtract(regionPrice);
-                                    player.sendMessage(ChatColor.YELLOW + "You have bought the region " + regionId + " for " +
-                                            iConomy.getBank().format(regionPrice));
-                                    DefaultDomain owners = region.getOwners();
-                                    owners.addPlayer(player.getName());
-                                    region.setOwners(owners);
-                                    flags.getBooleanFlag(DefaultFlag.BUYABLE).setValue(false);
-                                    account.save();
-                                } else {
-                                    player.sendMessage(ChatColor.YELLOW + "You have not enough money.");
-                                }
-                            } else {
-                                player.sendMessage(ChatColor.YELLOW + "You have not enough money.");
-                            }
-                        } else {
-                            player.sendMessage(ChatColor.RED + "Region: " + regionId + " is not buyable");
-                        } 
-                    } else {
-                        player.sendMessage(ChatColor.DARK_RED + "The region " + regionId + " does not exist.");
-                    }
-                } else {
-                    player.sendMessage(ChatColor.DARK_RED + "No region specified.");
-                }
-            }
-        }*/
-    }
-
-    /**
-     * Called when a player steps on a pressure plate or tramples crops.
-     *
-     * @param event
-     */
-    public void handlePhysicalInteract(PlayerInteractEvent event) {
-        if (event.isCancelled() == true) return;
-
-        Player player = event.getPlayer();
-        Block block = event.getClickedBlock(); //not actually clicked but whatever
-        Material type = block.getType();
-        World world = player.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (block.getType() == Material.SOIL && wcfg.disablePlayerCropTrampling) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.useRegions) {
-            Vector pt = toVector(block);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-            LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-            if (type == Material.STONE_PLATE || type == Material.WOOD_PLATE) {
-               if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                      && (!set.canBuild(localPlayer))
-                      && (!set.allows(DefaultFlag.USE))) {
-                   player.sendMessage(ChatColor.DARK_RED + "You are not allowed"
-                       + " to trigger pressure plates in this area.");
-                   event.setCancelled(true);
-                   return;
-               }
-            }
-        }
-    }
-
-    /**
-     * Called when a player joins a server
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
-
-        if (wcfg.fireSpreadDisableToggle) {
-            player.sendMessage(ChatColor.YELLOW
-                    + "Fire spread is currently globally disabled for this world.");
-        }
-        
-        if (plugin.inGroup(player, "wg-invincible")) {
-            cfg.enableGodMode(player);
-        }
-        
-        if (plugin.inGroup(player, "wg-amphibious")) {
-            cfg.enableAmphibiousMode(player);
-        }
-    }
-
-    /**
-     * Called when a player leaves a server
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        cfg.forgetPlayer(plugin.wrapPlayer(player));
-    }
-
-    /**
-     * Called when a player uses an item
-     * 
-     * @param event Relevant event details
-     *//*
-    @Override
-    public void onPlayerItem(PlayerItemEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        Block block = event.getBlockClicked();
-        ItemStack item = event.getItem();
-        int itemId = item.getTypeId();
-
-        GlobalConfiguration cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.getWorldConfig(player.getWorld().getName());
-
-        if (wcfg.useRegions
-                && (itemId == 322 || itemId == 320 || itemId == 319 || itemId == 297 || itemId == 260
-                        || itemId == 350 || itemId == 349 || itemId == 354) ) {
-            return;
-        }
-
-        if (!wcfg.itemDurability) {
-            // Hoes
-            if (item.getTypeId() >= 290 && item.getTypeId() <= 294) {
-                item.setDurability((byte) -1);
-                player.setItemInHand(item);
-            }
-        }
-
-        if (wcfg.useRegions && !event.isBlock() && block != null) {
-            Vector pt = toVector(block.getRelative(event.getBlockFace()));
-            if (block.getType() == Material.WALL_SIGN) {
-                pt = pt.subtract(0, 1, 0);
-            }
-
-            if (!cfg.canBuild(player, pt)) {
-                player.sendMessage(ChatColor.DARK_RED
-                        + "You don't have permission for this area.");
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.getBlacklist() != null && item != null && block != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                    toVector(block.getRelative(event.getBlockFace())),
-                    item.getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.useRegions && item != null && block != null && item.getTypeId() == 259) {
-            Vector pt = toVector(block.getRelative(event.getBlockFace()));
-            RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld().getName());
-
-            if (!mgr.getApplicableRegions(pt).isStateFlagAllowed(DefaultFlag.LIGHTER)) {
-                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();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
-
-        if (wcfg.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 drop an item
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerDropItem(PlayerDropItemEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(event.getPlayer().getWorld());
-
-        if (wcfg.getBlacklist() != null) {
-            Item ci = event.getItemDrop();
-
-            if (!wcfg.getBlacklist().check(
-                    new ItemDropBlacklistEvent(plugin.wrapPlayer(event.getPlayer()),
-                            toVector(ci.getLocation()), ci.getItemStack().getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Called when a player attempts to pickup an item
-     * 
-     * @param event
-     *            Relevant event details
-     */
-    @Override
-    public void onPlayerPickupItem(PlayerPickupItemEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(event.getPlayer().getWorld());
-
-        if (wcfg.getBlacklist() != null) {
-            Item ci = event.getItem();
-
-            if (!wcfg.getBlacklist().check(
-                    new ItemAcquireBlacklistEvent(plugin.wrapPlayer(event.getPlayer()),
-                            toVector(ci.getLocation()), ci.getItemStack().getTypeId()), false, true)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Called when a bucket is filled.
-     */
-    @Override
-    public void onPlayerBucketFill(PlayerBucketFillEvent event) {
-        Player player = event.getPlayer();
-        World world = player.getWorld();
-        
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-        
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlockClicked())) {
-            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-            event.setCancelled(true);
-            return;
-        }
-        
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                            toVector(player.getLocation()), event.getBucket().getId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Called when a bucket is empty.
-     */
-    @Override
-    public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
-        Player player = event.getPlayer();
-        World world = player.getWorld();
-        
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-        
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlockClicked())) {
-            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-            event.setCancelled(true);
-            return;
-        }
-        
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                            toVector(player.getLocation()), event.getBucket().getId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-    
-    @Override
-    public void onPlayerRespawn(PlayerRespawnEvent event) {
-        Player player = event.getPlayer();
-        Location location = player.getLocation();
-        
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
-        
-        if (wcfg.useRegions) {
-            Vector pt = toVector(location);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-    
-            Vector spawn = set.getFlag(DefaultFlag.SPAWN_LOC);
-    
-            if (spawn != null) {
-                RegionGroup group = set.getFlag(DefaultFlag.SPAWN_PERM);
-                Location spawnLoc = BukkitUtil.toLocation(player.getWorld(), spawn);
-                
-                if (group != null) {
-                    LocalPlayer localPlayer = plugin.wrapPlayer(player);
-                    
-                    if (group == RegionGroup.OWNERS) {
-                        if (set.isOwnerOfAll(localPlayer)) {
-                            event.setRespawnLocation(spawnLoc);
-                        }
-                    } else if (group == RegionGroup.MEMBERS) {
-                        if (set.isMemberOfAll(localPlayer)) {
-                            event.setRespawnLocation(spawnLoc);
-                        }
-                    }
-                } else {
-                    event.setRespawnLocation(spawnLoc);
-                }
-            }
-        }
-    }
-
-    /**
-     * Called when a player changes their held item.
-     */
-    @Override
-    public void onItemHeldChange(PlayerItemHeldEvent event) {
-        Player player = event.getPlayer();
-        
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
-        
-        if (wcfg.removeInfiniteStacks
-                && !plugin.hasPermission(player, "worldguard.override.infinite-stack")) {
-            int newSlot = event.getNewSlot();
-            ItemStack heldItem = player.getInventory().getItem(newSlot);
-            if (heldItem.getAmount() < 0) {
-                player.getInventory().setItem(newSlot, null);
-                player.sendMessage(ChatColor.RED + "Infinite stack removed.");
-            }
-        }
-    }
-
-    @Override
-    public void onPlayerBedEnter(PlayerBedEnterEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        Location location = player.getLocation();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
-
-        if (wcfg.useRegions) {
-            Vector pt = toVector(location);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-            if (!plugin.getGlobalRegionManager().hasBypass(player, player.getWorld())
-                && !set.allows(DefaultFlag.SLEEP)) {
-                    event.setCancelled(true);
-                    player.sendMessage("This bed doesn't belong to you!");
-                    return;
-            }
-        }
-    }
-}

src/com/sk89q/worldguard/bukkit/commands/RegionCommands.java

@@ -1,857 +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.bukkit.commands;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Map;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import com.sk89q.minecraft.util.commands.*;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldedit.bukkit.selections.*;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.WorldConfiguration;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.*;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
-import com.sk89q.worldguard.util.RegionUtil;
-
-public class RegionCommands {
-    
-    @Command(aliases = {"define", "def", "d"},
-            usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
-            desc = "Defines a region",
-            flags = "", min = 1, max = -1)
-    @CommandPermissions({"worldguard.region.define"})
-    public static void define(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        WorldEditPlugin worldEdit = plugin.getWorldEdit();
-        String id = args.getString(0);
-        
-        if (!ProtectedRegion.isValidId(id)) {
-            throw new CommandException("Invalid region ID specified!");
-        }
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("A region cannot be named __global__");
-        }
-        
-        // Attempt to get the player's selection from WorldEdit
-        Selection sel = worldEdit.getSelection(player);
-        
-        if (sel == null) {
-            throw new CommandException("Select a region with WorldEdit first.");
-        }
-        
-        ProtectedRegion region;
-        
-        // Detect the type of region from WorldEdit
-        if (sel instanceof Polygonal2DSelection) {
-            Polygonal2DSelection polySel = (Polygonal2DSelection) sel;
-            int minY = polySel.getNativeMinimumPoint().getBlockY();
-            int maxY = polySel.getNativeMaximumPoint().getBlockY();
-            region = new ProtectedPolygonalRegion(id, polySel.getNativePoints(), minY, maxY);
-        } else if (sel instanceof CuboidSelection) {
-            BlockVector min = sel.getNativeMinimumPoint().toBlockVector();
-            BlockVector max = sel.getNativeMaximumPoint().toBlockVector();
-            region = new ProtectedCuboidRegion(id, min, max);
-        } else {
-            throw new CommandException(
-                    "The type of region selected in WorldEdit is unsupported in WorldGuard!");
-        }
-
-        // Get the list of region owners
-        if (args.argsLength() > 1) {
-            region.setOwners(RegionUtil.parseDomainString(args.getSlice(1), 1));
-        }
-        
-        RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
-        mgr.addRegion(region);
-        
-        try {
-            mgr.save();
-            sender.sendMessage(ChatColor.YELLOW + "Region saved as " + id + ".");
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"redefine", "update", "move"},
-            usage = "<id>",
-            desc = "Re-defines the shape of a region",
-            flags = "", min = 1, max = 1)
-    public static void redefine(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        WorldEditPlugin worldEdit = plugin.getWorldEdit();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
-        }
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion existing = mgr.getRegion(id);
-
-        if (existing == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-        
-        if (existing.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.redefine.own");
-        } else if (existing.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.redefine.member");
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.redefine");
-        } 
-        
-        // Attempt to get the player's selection from WorldEdit
-        Selection sel = worldEdit.getSelection(player);
-        
-        if (sel == null) {
-            throw new CommandException("Select a region with WorldEdit first.");
-        }
-        
-        ProtectedRegion region;
-        
-        // Detect the type of region from WorldEdit
-        if (sel instanceof Polygonal2DSelection) {
-            Polygonal2DSelection polySel = (Polygonal2DSelection) sel;
-            int minY = polySel.getNativeMinimumPoint().getBlockY();
-            int maxY = polySel.getNativeMaximumPoint().getBlockY();
-            region = new ProtectedPolygonalRegion(id, polySel.getNativePoints(), minY, maxY);
-        } else if (sel instanceof CuboidSelection) {
-            BlockVector min = sel.getNativeMinimumPoint().toBlockVector();
-            BlockVector max = sel.getNativeMaximumPoint().toBlockVector();
-            region = new ProtectedCuboidRegion(id, min, max);
-        } else {
-            throw new CommandException(
-                    "The type of region selected in WorldEdit is unsupported in WorldGuard!");
-        }
-
-        region.setMembers(existing.getMembers());
-        region.setOwners(existing.getOwners());
-        region.setFlags(existing.getFlags());
-        region.setPriority(existing.getPriority());
-        try {
-            region.setParent(existing.getParent());
-        } catch (CircularInheritanceException e) {
-        }
-        
-        mgr.addRegion(region);
-        
-        sender.sendMessage(ChatColor.YELLOW + "Region updated with new area.");
-        
-        try {
-            mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"claim"},
-            usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
-            desc = "Claim a region",
-            flags = "", min = 1, max = -1)
-    @CommandPermissions({"worldguard.region.claim"})
-    public static void claim(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        WorldEditPlugin worldEdit = plugin.getWorldEdit();
-        String id = args.getString(0);
-        
-        if (!ProtectedRegion.isValidId(id)) {
-            throw new CommandException("Invalid region ID specified!");
-        }
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("A region cannot be named __global__");
-        }
-        
-        // Attempt to get the player's selection from WorldEdit
-        Selection sel = worldEdit.getSelection(player);
-        
-        if (sel == null) {
-            throw new CommandException("Select a region with WorldEdit first.");
-        }
-        
-        ProtectedRegion region;
-        
-        // Detect the type of region from WorldEdit
-        if (sel instanceof Polygonal2DSelection) {
-            Polygonal2DSelection polySel = (Polygonal2DSelection) sel;
-            int minY = polySel.getNativeMinimumPoint().getBlockY();
-            int maxY = polySel.getNativeMaximumPoint().getBlockY();
-            region = new ProtectedPolygonalRegion(id, polySel.getNativePoints(), minY, maxY);
-        } else if (sel instanceof CuboidSelection) {
-            BlockVector min = sel.getNativeMinimumPoint().toBlockVector();
-            BlockVector max = sel.getNativeMaximumPoint().toBlockVector();
-            region = new ProtectedCuboidRegion(id, min, max);
-        } else {
-            throw new CommandException(
-                    "The type of region selected in WorldEdit is unsupported in WorldGuard!");
-        }
-
-        // Get the list of region owners
-        if (args.argsLength() > 1) {
-            region.setOwners(RegionUtil.parseDomainString(args.getSlice(1), 1));
-        }
-
-        WorldConfiguration wcfg = plugin.getGlobalConfiguration().get(player.getWorld());
-        RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
-        
-        // Check whether the player has created too many regions 
-        if (wcfg.maxRegionCountPerPlayer >= 0
-                && mgr.getRegionCountOfPlayer(localPlayer) >= wcfg.maxRegionCountPerPlayer) {
-            throw new CommandException("You own too many regions, delete one first to claim a new one.");
-        }
-
-        ProtectedRegion existing = mgr.getRegion(id);
-
-        // Check for an existing region
-        if (existing != null) {
-            if (!existing.getOwners().contains(localPlayer)) {
-                throw new CommandException("This region already exists and you don't own it.");
-            }
-        }
-        
-        ApplicableRegionSet regions = mgr.getApplicableRegions(region);
-        
-        // Check if this region overlaps any other region
-        if (regions.size() > 0) {
-            if (!regions.isOwnerOfAll(localPlayer)) {
-                throw new CommandException("This region overlaps with someone else's region.");
-            }
-        } else {
-            if (wcfg.claimOnlyInsideExistingRegions) {
-                throw new CommandException("You may only claim regions inside " +
-                		"existing regions that you or your group own.");
-            }
-        }
-
-        /*if (plugin.getGlobalConfiguration().getiConomy() != null && wcfg.useiConomy && wcfg.buyOnClaim) {
-            if (iConomy.getBank().hasAccount(player.getName())) {
-                Account account = iConomy.getBank().getAccount(player.getName());
-                double balance = account.getBalance();
-                double regionCosts = region.countBlocks() * wcfg.buyOnClaimPrice;
-                if (balance >= regionCosts) {
-                    account.subtract(regionCosts);
-                    player.sendMessage(ChatColor.YELLOW + "You have bought that region for "
-                            + iConomy.getBank().format(regionCosts));
-                    account.save();
-                } else {
-                    player.sendMessage(ChatColor.RED + "You have not enough money.");
-                    player.sendMessage(ChatColor.RED + "The region you want to claim costs "
-                            + iConomy.getBank().format(regionCosts));
-                    player.sendMessage(ChatColor.RED + "You have " + iConomy.getBank().format(balance));
-                    return;
-                }
-            } else {
-                player.sendMessage(ChatColor.YELLOW + "You have not enough money.");
-                return;
-            }
-        }*/
-
-        if (region.volume() > wcfg.maxClaimVolume) {
-            player.sendMessage(ChatColor.RED + "This region is to large to claim.");
-            player.sendMessage(ChatColor.RED +
-                    "Max. volume: " + wcfg.maxClaimVolume + ", your volume: " + region.volume());
-            return;
-        }
-
-        region.getOwners().addPlayer(player.getName());
-        mgr.addRegion(region);
-        
-        try {
-            mgr.save();
-            sender.sendMessage(ChatColor.YELLOW + "Region saved as " + id + ".");
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"select", "sel", "s"},
-            usage = "<id>",
-            desc = "Load a region as a WorldEdit selection",
-            flags = "", min = 1, max = 1)
-    public static void select(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        WorldEditPlugin worldEdit = plugin.getWorldEdit();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.select.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.select.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.select." + id.toLowerCase());
-        }
-
-        if (region instanceof ProtectedCuboidRegion) {
-            ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion) region;
-            Vector pt1 = cuboid.getMinimumPoint();
-            Vector pt2 = cuboid.getMaximumPoint();
-            CuboidSelection selection = new CuboidSelection(world, pt1, pt2);
-            worldEdit.setSelection(player, selection);
-            sender.sendMessage(ChatColor.YELLOW + "Region selected as a cuboid.");
-        } else if (region instanceof ProtectedPolygonalRegion) {
-            ProtectedPolygonalRegion poly2d = (ProtectedPolygonalRegion) region;
-            Polygonal2DSelection selection = new Polygonal2DSelection(world, poly2d.getPoints(),
-                    poly2d.getMinimumPoint().getBlockY(), poly2d.getMaximumPoint().getBlockY());
-            worldEdit.setSelection(player, selection);
-            sender.sendMessage(ChatColor.YELLOW + "Region selected as a polygon.");
-        } else if (region instanceof GlobalProtectedRegion) {
-            throw new CommandException("Can't select global regions.");
-        } else {
-            throw new CommandException("Unknown region type: " + region.getClass().getCanonicalName());
-        }
-    }
-    
-    @Command(aliases = {"info", "i"},
-            usage = "[world] <id>",
-            desc = "Get information about a region",
-            flags = "", min = 1, max = 2)
-    public static void info(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-
-        Player player = null;
-        LocalPlayer localPlayer = null;
-        World world;
-        String id;
-        
-        // Get different values based on provided arguments
-        if (args.argsLength() == 1) {
-            player = plugin.checkPlayer(sender);
-            localPlayer = plugin.wrapPlayer(player);
-            world = player.getWorld();
-            id = args.getString(0).toLowerCase();
-        } else {
-            world = plugin.matchWorld(sender, args.getString(0));
-            id = args.getString(1).toLowerCase();
-        }
-        
-        if (!ProtectedRegion.isValidId(id)) {
-            throw new CommandException("Invalid region ID specified!");
-        }
-        
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        
-        if (!mgr.hasRegion(id)) {
-            throw new CommandException("A region with ID '" + id + "' doesn't exist.");
-        }
-
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (player != null) {
-            if (region.isOwner(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.info.own");
-            } else if (region.isMember(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.info.member");
-            } else {
-                plugin.checkPermission(sender, "worldguard.region.info");
-            }
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.info");
-        }
-
-        DefaultDomain owners = region.getOwners();
-        DefaultDomain members = region.getMembers();
-
-        sender.sendMessage(ChatColor.YELLOW + "Region: " + id
-                + ChatColor.GRAY + " (type: " + region.getTypeName() + ")");
-        sender.sendMessage(ChatColor.BLUE + "Priority: " + region.getPriority());
-
-        StringBuilder s = new StringBuilder();
-
-        for (Flag<?> flag : DefaultFlag.getFlags()) {
-            Object val = region.getFlag(flag);
-            
-            if (val == null) {
-                continue;
-            }
-            
-            if (s.length() > 0) {
-                s.append(", ");
-            }
-
-            s.append(flag.getName() + ": " + String.valueOf(val));
-        }
-
-        sender.sendMessage(ChatColor.BLUE + "Flags: " + s.toString());
-        sender.sendMessage(ChatColor.BLUE + "Parent: "
-                + (region.getParent() == null ? "(none)" : region.getParent().getId()));
-        sender.sendMessage(ChatColor.LIGHT_PURPLE + "Owners: "
-                + owners.toUserFriendlyString());
-        sender.sendMessage(ChatColor.LIGHT_PURPLE + "Members: "
-                + members.toUserFriendlyString());
-    }
-    
-    @Command(aliases = {"list"},
-            usage = "[page] [world]",
-            desc = "Get a list of regions",
-            flags = "", min = 0, max = 2)
-    @CommandPermissions({"worldguard.region.list"})
-    public static void list(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-
-        World world;
-        int page = 0;
-        
-        if (args.argsLength() > 0) {
-            page = Math.max(0, args.getInteger(0) - 1);
-        }
-        
-        if (args.argsLength() > 1) {
-            world = plugin.matchWorld(sender, args.getString(1));
-        } else {
-            world = plugin.checkPlayer(sender).getWorld();
-        }
-        
-        int listSize = 10;
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        Map<String, ProtectedRegion> regions = mgr.getRegions();
-        int size = regions.size();
-        int pages = (int) Math.ceil(size / (float) listSize);
-
-        String[] regionIDList = new String[size];
-        int index = 0;
-        for (String id : regions.keySet()) {
-            regionIDList[index] = id;
-            index++;
-        }
-        Arrays.sort(regionIDList);
-
-        sender.sendMessage(ChatColor.RED + "Regions (page "
-                + (page + 1) + " of " + pages + "):");
-
-        if (page < pages) {
-            for (int i = page * listSize; i < page * listSize + listSize; i++) {
-                if (i >= size) {
-                    break;
-                }
-                sender.sendMessage(ChatColor.YELLOW.toString() + (i + 1) +
-                        ". " + regionIDList[i]);
-            }
-        }
-    }
-    
-    @Command(aliases = {"flag", "f"},
-            usage = "<id> <flag> [value]",
-            desc = "Set flags",
-            flags = "", min = 2, max = -1)
-    public static void flag(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        String flagName = args.getString(1);
-        String value = null;
-
-        if (args.argsLength() >= 3) {
-            value = args.getJoinedStrings(2);
-        }
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            if (id.equalsIgnoreCase("__global__")) {
-                region = new GlobalProtectedRegion(id);
-                mgr.addRegion(region);
-            } else {
-                throw new CommandException("Could not find a region by that ID.");
-            }
-        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.flag.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.flag.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.flag." + id.toLowerCase());
-        } 
-        
-        Flag<?> foundFlag = null;
-        
-        // Now time to find the flag!
-        for (Flag<?> flag : DefaultFlag.getFlags()) {
-            // Try to detect the flag
-            if (flag.getName().replace("-", "").equalsIgnoreCase(flagName.replace("-", ""))) {
-                foundFlag = flag;
-                break;
-            }
-        }
-        
-        if (foundFlag == null) {
-            StringBuilder list = new StringBuilder();
-            
-            // Need to build a list
-            for (Flag<?> flag : DefaultFlag.getFlags()) {
-                if (list.length() > 0) {
-                    list.append(", ");
-                }
-
-                if (region.isOwner(localPlayer)) {
-                    if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
-                            + flag.getName() + ".owner." + id.toLowerCase())) {
-                        continue;
-                    }
-                } else if (region.isMember(localPlayer)) {
-                    if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
-                            + flag.getName() + ".member." + id.toLowerCase())) {
-                        continue;
-                    }
-                } else {
-                    if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
-                                + flag.getName() + "." + id.toLowerCase())) {
-                        continue;
-                    }
-                } 
-                
-                list.append(flag.getName());
-            }
-
-            player.sendMessage(ChatColor.RED + "Unknown flag specified: " + flagName);
-            player.sendMessage(ChatColor.RED + "Available flags: " + list);
-            return;
-        }
-
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.flag.flags."
-                    + foundFlag.getName() + ".owner." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.flag.flags."
-                    + foundFlag.getName() + ".member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.flag.flags."
-                    + foundFlag.getName() + "." + id.toLowerCase());
-        } 
-        
-        if (value != null) {
-            try {
-                setFlag(region, foundFlag, plugin, sender, value);
-            } catch (InvalidFlagFormat e) {
-                throw new CommandException(e.getMessage());
-            }
-
-            sender.sendMessage(ChatColor.YELLOW
-                    + "Region flag '" + foundFlag.getName() + "' set.");
-        } else {
-            // Clear the flag
-            region.setFlag(foundFlag, null);
-
-            sender.sendMessage(ChatColor.YELLOW
-                    + "Region flag '" + foundFlag.getName() + "' cleared.");
-        }
-        
-        try {
-            mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    public static <V> void setFlag(ProtectedRegion region,
-            Flag<V> flag, WorldGuardPlugin plugin, CommandSender sender, String value)
-                throws InvalidFlagFormat {
-        region.setFlag(flag, flag.parseInput(plugin, sender, value));
-    }
-    
-    @Command(aliases = {"setpriority", "priority", "pri"},
-            usage = "<id> <priority>",
-            desc = "Set the priority of a region",
-            flags = "", min = 2, max = 2)
-    public static void setPriority(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        int priority = args.getInteger(1);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
-        }
-        
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.setpriority.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.setpriority.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.setpriority." + id.toLowerCase());
-        } 
-
-        region.setPriority(priority);
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Priority of '" + region.getId() + "' set to "
-                + priority + ".");
-        
-        try {
-            mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"setparent", "parent", "par"},
-            usage = "<id> [parent-id]",
-            desc = "Set the parent of a region",
-            flags = "", min = 1, max = 2)
-    public static void setParent(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
-        }
-        
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-        
-        if (args.argsLength() == 1) {
-            try {
-                region.setParent(null);
-            } catch (CircularInheritanceException e) {
-            }
-    
-            sender.sendMessage(ChatColor.YELLOW
-                    + "Parent of '" + region.getId() + "' cleared.");
-        } else {
-            String parentId = args.getString(1);
-            ProtectedRegion parent = mgr.getRegion(parentId);
-    
-            if (region == null) {
-                throw new CommandException("Could not find a target region by that ID.");
-            }
-    
-            if (parent == null) {
-                throw new CommandException("Could not find the parent region by that ID.");
-            }
-            
-            if (region.isOwner(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.setparent.own." + id.toLowerCase());
-            } else if (region.isMember(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.setparent.member." + id.toLowerCase());
-            } else {
-                plugin.checkPermission(sender, "worldguard.region.setparent." + id.toLowerCase());
-            } 
-            
-            if (parent.isOwner(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.setparent.own." + id.toLowerCase());
-            } else if (parent.isMember(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.setparent.member." + id.toLowerCase());
-            } else {
-                plugin.checkPermission(sender, "worldguard.region.setparent." + id.toLowerCase());
-            }
-            
-            try {
-                region.setParent(parent);
-            } catch (CircularInheritanceException e) {
-                throw new CommandException("Circular inheritance detected!");
-            }
-    
-            sender.sendMessage(ChatColor.YELLOW
-                    + "Parent of '" + region.getId() + "' set to '"
-                    + parent.getId() + "'.");
-        }
-        
-        try {
-            mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"remove", "delete", "del", "rem"},
-            usage = "<id>",
-            desc = "Remove a region",
-            flags = "", min = 1, max = 1)
-    public static void remove(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.remove.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.remove.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.remove." + id.toLowerCase());
-        }
-        
-        mgr.removeRegion(id);
-        
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' removed.");
-        
-        try {
-            mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"load", "reload"},
-            usage = "[world]",
-            desc = "Reload regions from file",
-            flags = "", min = 0, max = 1)
-    public static void load(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        World world = null;
-        
-        if (args.argsLength() > 0) {
-            world = plugin.matchWorld(sender, args.getString(0));
-        }
-
-        if (world != null) {
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            
-            try {
-                mgr.load();
-                sender.sendMessage(ChatColor.YELLOW
-                        + "Regions for '" + world.getName() + "' load.");
-            } catch (IOException e) {
-                throw new CommandException("Failed to read regions file: "
-                        + e.getMessage());
-            }
-        } else {
-            for (World w : plugin.getServer().getWorlds()) {
-                RegionManager mgr = plugin.getGlobalRegionManager().get(w);
-                
-                try {
-                    mgr.load();
-                } catch (IOException e) {
-                    throw new CommandException("Failed to read regions file: "
-                            + e.getMessage());
-                }
-            }
-            
-            sender.sendMessage(ChatColor.YELLOW
-                    + "Region databases loaded.");
-        }
-    }
-    
-    @Command(aliases = {"save", "write"},
-            usage = "[world]",
-            desc = "Re-save regions to file",
-            flags = "", min = 0, max = 1)
-    public static void save(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        World world = null;
-        
-        if (args.argsLength() > 0) {
-            world = plugin.matchWorld(sender, args.getString(0));
-        }
-
-        if (world != null) {
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            
-            try {
-                mgr.save();
-                sender.sendMessage(ChatColor.YELLOW
-                        + "Regions for '" + world.getName() + "' saved.");
-            } catch (IOException e) {
-                throw new CommandException("Failed to write regions file: "
-                        + e.getMessage());
-            }
-        } else {
-            for (World w : plugin.getServer().getWorlds()) {
-                RegionManager mgr = plugin.getGlobalRegionManager().get(w);
-                
-                try {
-                    mgr.save();
-                } catch (IOException e) {
-                    throw new CommandException("Failed to write regions file: "
-                            + e.getMessage());
-                }
-            }
-            
-            sender.sendMessage(ChatColor.YELLOW
-                    + "Region databases saved.");
-        }
-    }
-}

src/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java

@@ -1,219 +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.bukkit.commands;
-
-import java.io.IOException;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import com.sk89q.minecraft.util.commands.Command;
-import com.sk89q.minecraft.util.commands.CommandContext;
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import com.sk89q.worldguard.util.RegionUtil;
-
-// @TODO: A lot of code duplication here! Need to fix.
-
-public class RegionMemberCommands {
-    
-    @Command(aliases = {"addmember", "addmember"},
-            usage = "<id> <members...>",
-            desc = "Add a member to a region",
-            flags = "", min = 2, max = -1)
-    public static void addMember(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
-        }
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addmember.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addmember.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.addmember." + id.toLowerCase());
-        }
-
-        RegionUtil.addToDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' updated.");
-        
-        try {
-            mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"addowner", "addowner"},
-            usage = "<id> <owners...>",
-            desc = "Add an owner to a region",
-            flags = "", min = 2, max = -1)
-    public static void addOwner(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
-        }
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addowner.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addowner.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
-        }
-
-        RegionUtil.addToDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' updated.");
-        
-        try {
-            mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"},
-            usage = "<id> <owners...>",
-            desc = "Remove an owner to a region",
-            flags = "", min = 2, max = -1)
-    public static void removeMember(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
-        }
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removemember.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removemember.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.removemember." + id.toLowerCase());
-        }
-
-        RegionUtil.removeFromDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' updated.");
-        
-        try {
-            mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"removeowner", "remowner"},
-            usage = "<id> <owners...>",
-            desc = "Remove an owner to a region",
-            flags = "", min = 2, max = -1)
-    public static void removeOwner(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
-        }
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removeowner.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removeowner.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.removeowner." + id.toLowerCase());
-        }
-
-        RegionUtil.removeFromDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' updated.");
-        
-        try {
-            mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
-                    + e.getMessage());
-        }
-    }
-}

src/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java

@@ -1,90 +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.bukkit.commands;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import com.sk89q.minecraft.util.commands.*;
-import com.sk89q.worldguard.bukkit.WorldConfiguration;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-
-public class ToggleCommands {
-
-    @Command(aliases = {"stopfire"},
-            usage = "[<world>]", desc = "Disables all fire spread temporarily",
-            flags = "", min = 0, max = 1)
-    @CommandPermissions({"worldguard.fire-toggle.stop"})
-    public static void stopFire(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        World world;
-        
-        if (args.argsLength() == 0) {
-            world = plugin.checkPlayer(sender).getWorld();
-        } else {
-            world = plugin.matchWorld(sender, args.getString(0));
-        }
-        
-        WorldConfiguration wcfg = plugin.getGlobalConfiguration().get(world);
-
-        if (!wcfg.fireSpreadDisableToggle) {
-            plugin.getServer().broadcastMessage(
-                    ChatColor.YELLOW
-                    + "Fire spread has been globally disabled for '" + world.getName() + "' by "
-                    + plugin.toName(sender) + ".");
-        } else {
-            sender.sendMessage(
-                    ChatColor.YELLOW
-                    + "Fire spread was already globally disabled.");
-        }
-
-        wcfg.fireSpreadDisableToggle = true;
-    }
-
-    @Command(aliases = {"allowfire"},
-            usage = "[<world>]", desc = "Allows all fire spread temporarily",
-            flags = "", min = 0, max = 1)
-    @CommandPermissions({"worldguard.fire-toggle.stop"})
-    public static void allowFire(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        World world;
-        
-        if (args.argsLength() == 0) {
-            world = plugin.checkPlayer(sender).getWorld();
-        } else {
-            world = plugin.matchWorld(sender, args.getString(0));
-        }
-        
-        WorldConfiguration wcfg = plugin.getGlobalConfiguration().get(world);
-
-        if (wcfg.fireSpreadDisableToggle) {
-            plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                    + "Fire spread has been globally for '" + world.getName() + "' re-enabled by "
-                    + plugin.toName(sender) + ".");
-        } else {
-            sender.sendMessage(ChatColor.YELLOW
-                    + "Fire spread was already globally enabled.");
-        }
-
-        wcfg.fireSpreadDisableToggle = false;
-    }
-}

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

@@ -1,13 +0,0 @@
-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/protection/TimedFlagsTimer.java

@@ -1,174 +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.protection;
-
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.BukkitPlayer;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import java.util.HashMap;
-import java.util.Map;
-import org.bukkit.entity.Player;
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
-
-/**
- * Timer for handling flags that require a constant timer..
- * 
- * @author Michael
- */
-public class TimedFlagsTimer implements Runnable {
-
-    private WorldGuardPlugin plugin;
-
-    private Map<String, TimedFlagPlayerInfo> playerData;
-
-    /**
-     * Construct the object.
-     * 
-     * @param plugin
-     */
-    public TimedFlagsTimer(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-        this.playerData = new HashMap<String, TimedFlagPlayerInfo>();
-    }
-
-    private TimedFlagPlayerInfo getPlayerInfo(String name) {
-        TimedFlagPlayerInfo ret = playerData.get(name);
-        if (ret == null) {
-            ret = new TimedFlagPlayerInfo();
-            playerData.put(name, ret);
-        }
-
-        return ret;
-    }
-
-    public void run() {
-/*
-        // get players
-        Player[] players = plugin.getServer().getOnlinePlayers();
-
-        for (Player player : players) {
-
-            TimedFlagPlayerInfo nfo = getPlayerInfo(player.getName());
-            long now = System.currentTimeMillis();
-
-            // check healing flag
-            if (nfo.sheduledHealTick != null && now >= nfo.sheduledHealTick) {
-                player.setHealth(player.getHealth() + nfo.sheduledHealAmount);
-                nfo.sheduledHealTick = null;
-                nfo.lastHealTick = now;
-            }
-
-            if (player.getWorld().getName() == null) {
-                continue;
-            }
-            RegionManager mgr = plugin.getGlobalRegionManager().get(
-                    player.getWorld().getName());
-            ApplicableRegionSet regions = mgr
-                    .getApplicableRegions(toVector(player.getLocation()));
-
-            Integer healDelay = regions.getFlag(DefaultFlag.HEAL_DELAY);
-
-            if (healDelay > 0) {
-                healDelay *= 1000;
-                int healAmount = regions.getIntegerFlag(
-                        DefaultFlag.HEAL_AMOUNT, true).getValue(1);
-                if (now - nfo.lastHealTick > healDelay) {
-                    if (player.getHealth() < 20) {
-                        if (player.getHealth() + healAmount > 20) {
-                            player.setHealth(20);
-                        } else {
-                            player.setHealth(player.getHealth() + healAmount);
-                        }
-                    }
-                } else {
-                    nfo.sheduledHealTick = now + healDelay;
-                    nfo.sheduledHealAmount = healAmount;
-                }
-            }
-
-            // check greeting/farewell flag
-            String newRegionName = regions.getAffectedRegionId();
-
-            if (newRegionName != null) {
-
-                if (nfo.lastRegion == null
-                        || !newRegionName.equals(nfo.lastRegion)) {
-                    String newGreetMsg = regions.getStringFlag(
-                            DefaultFlag.GREET_MESSAGE, true).getValue();
-                    String farewellMsg = regions.getStringFlag(
-                            DefaultFlag.FAREWELL_MESSAGE, true).getValue();
-
-                    if (nfo.lastFarewellMsg != null) {
-                        player.sendMessage(nfo.lastFarewellMsg);
-                        nfo.lastFarewellMsg = null;
-                    }
-                    if (newGreetMsg != null) {
-                        player.sendMessage(newGreetMsg);
-                    }
-                    if (regions.getBooleanFlag(DefaultFlag.NOTIFY_GREET, false)
-                            .getValue(false)) {
-                        broadcastNotification(ChatColor.YELLOW + "Player "
-                                + player.getName() + " entered region "
-                                + newRegionName);
-                    }
-                    nfo.lastFarewellMsg = farewellMsg;
-                    nfo.lastRegion = newRegionName;
-                }
-            } else {
-                if (nfo.lastRegion != null) {
-                    if (nfo.lastFarewellMsg != null) {
-                        player.sendMessage(nfo.lastFarewellMsg);
-                        nfo.lastFarewellMsg = null;
-                    }
-                    if (regions.getBooleanFlag(DefaultFlag.NOTIFY_FAREWELL,
-                            false).getValue(false)) {
-                        broadcastNotification(ChatColor.YELLOW + "Player "
-                                + player.getName() + " left region "
-                                + nfo.lastRegion);
-                    }
-                    nfo.lastRegion = null;
-                }
-            }
-
-            // check passthrough flag
-            LocalPlayer lplayer = BukkitPlayer.wrapPlayer(plugin, player);
-            if (!regions.isStateFlagAllowed(DefaultFlag.PASSTHROUGH, lplayer)) {
-                Location newLoc = player.getLocation().clone();
-                newLoc.setX(newLoc.getBlockX() - 30);
-                newLoc.setY(newLoc.getWorld().getHighestBlockYAt(newLoc) + 1);
-                player.teleportTo(newLoc);
-            }
-
-        }*/
-    }
-
-    public void broadcastNotification(String msg) {
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            if (plugin.hasPermission(player, "notify_onenter")) {
-                player.sendMessage(msg);
-            }
-        }
-    }
-
-}

src/com/sk89q/worldguard/protection/flags/DefaultFlag.java

@@ -1,88 +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.protection.flags;
-
-/**
- *
- * @author sk89q
- */
-public final class DefaultFlag {
-    
-    public static final StateFlag PASSTHROUGH = new StateFlag("passthrough", 'z', false);
-    public static final StateFlag BUILD = new StateFlag("build", 'b', true);
-    public static final StateFlag PVP = new StateFlag("pvp", 'p', true);
-    public static final StateFlag MOB_DAMAGE = new StateFlag("mob-damage", 'm', true);
-    public static final StateFlag MOB_SPAWNING = new StateFlag("mob-spawning", true);
-    public static final StateFlag CREEPER_EXPLOSION = new StateFlag("creeper-explosion", 'c', true);
-    public static final StateFlag SLEEP = new StateFlag("sleep", true);
-    public static final StateFlag TNT = new StateFlag("tnt", 't', true);
-    public static final StateFlag LIGHTER = new StateFlag("lighter", 'l', true);
-    public static final StateFlag FIRE_SPREAD = new StateFlag("fire-spread", 'f', true);
-    public static final StateFlag LAVA_FIRE = new StateFlag("lava-fire", 'F', true);
-    public static final StateFlag CHEST_ACCESS = new StateFlag("chest-access", 'C', false);
-    public static final StateFlag WATER_FLOW = new StateFlag("water-flow", true);
-    public static final StateFlag LAVA_FLOW = new StateFlag("lava-flow", true);
-    public static final StateFlag USE = new StateFlag("use", false);
-    public static final StateFlag PLACE_VEHICLE = new StateFlag("vehicle-place", false);
-    public static final StringFlag GREET_MESSAGE = new StringFlag("greeting");
-    public static final StringFlag FAREWELL_MESSAGE = new StringFlag("farewell");
-    public static final BooleanFlag NOTIFY_GREET = new BooleanFlag("notify-greet");
-    public static final BooleanFlag NOTIFY_FAREWELL = new BooleanFlag("notify-farewell");
-    public static final StringFlag DENY_SPAWN = new StringFlag("deny-spawn");
-    public static final IntegerFlag HEAL_DELAY = new IntegerFlag("heal-delay");
-    public static final IntegerFlag HEAL_AMOUNT = new IntegerFlag("heal-amount");
-    public static final VectorFlag TELE_LOC = new VectorFlag("teleport");
-    public static final RegionGroupFlag TELE_PERM = new RegionGroupFlag("teleport-group");
-    public static final VectorFlag SPAWN_LOC = new VectorFlag("spawn");
-    public static final RegionGroupFlag SPAWN_PERM = new RegionGroupFlag("spawn-group");
-    public static final BooleanFlag BUYABLE = new BooleanFlag("buyable");
-    public static final DoubleFlag PRICE = new DoubleFlag("price");
-    
-    public static final Flag<?>[] flagsList = new Flag<?>[] {
-        PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, MOB_SPAWNING, CREEPER_EXPLOSION, SLEEP,
-        TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, CHEST_ACCESS, WATER_FLOW, LAVA_FLOW,
-        USE, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_GREET,
-        NOTIFY_FAREWELL, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,
-        TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE
-    };
-    
-    private DefaultFlag() {
-    }
-    
-    public static Flag<?>[] getFlags() {
-        return flagsList;
-    }
-    
-    /**
-     * Get the legacy flag.
-     * 
-     * @param flagString
-     * @return null if not found
-     */
-    public static StateFlag getLegacyFlag(String flagString) {
-        for (Flag<?> flag : flagsList) {
-            if (flag instanceof StateFlag && flagString.equals(String.valueOf(flag.getLegacyCode()))) {
-                return (StateFlag) flag;
-            }
-        }
-        
-        return null;
-    }
-}

src/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java

@@ -1,82 +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.protection.flags;
-
-import org.bukkit.command.CommandSender;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-
-/**
- *
- * @author sk89q
- */
-public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {
-    
-    public static enum RegionGroup {
-        MEMBERS,
-        OWNERS
-    }
-    
-    public RegionGroupFlag(String name, char legacyCode) {
-        super(name, legacyCode);
-    }
-
-    public RegionGroupFlag(String name) {
-        super(name);
-    }
-
-    @Override
-    public RegionGroup parseInput(WorldGuardPlugin plugin, CommandSender sender,
-            String input) throws InvalidFlagFormat {
-        input = input.trim();
-        
-        if (input.equalsIgnoreCase("members") || input.equalsIgnoreCase("member")) {
-            return RegionGroup.MEMBERS;
-        } else if (input.equalsIgnoreCase("owners") || input.equalsIgnoreCase("owner")) {
-            return RegionGroup.OWNERS;
-        } else if (input.equalsIgnoreCase("everyone") || input.equalsIgnoreCase("anyone")) {
-            return null;
-        } else {
-            throw new InvalidFlagFormat("Not none/allow/deny: " + input);
-        }
-    }
-
-    @Override
-    public RegionGroup unmarshal(Object o) {
-        String str = o.toString();
-        if (str.equalsIgnoreCase("members")) {
-            return RegionGroup.MEMBERS;
-        } else if (str.equalsIgnoreCase("owners")) {
-            return RegionGroup.OWNERS;
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public Object marshal(RegionGroup o) {
-        if (o == RegionGroup.MEMBERS) {
-            return "members";
-        } else if (o == RegionGroup.OWNERS) {
-            return "owners";
-        } else {
-            return null;
-        }
-    }
-    
-}

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

@@ -1,164 +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.protection.managers;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-
-/**
- * An abstract class 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 abstract class RegionManager {
-    
-    protected ProtectionDatabase loader;
-
-    /**
-     * Construct the object.
-     * 
-     * @param loader
-     */
-    public RegionManager(ProtectionDatabase loader) {
-        this.loader = loader;
-    }
-
-    /**
-     * Load the list of regions.
-     *
-     * @throws IOException
-     */
-    public void load() throws IOException {
-        loader.load(this);
-    }
-
-    /**
-     * Save the list of regions.
-     *
-     * @throws IOException
-     */
-    public void save() throws IOException {
-        loader.save(this);
-    }
-
-    /**
-     * Get a list of protected regions.
-     * 
-     * @return
-     */
-    public abstract Map<String, ProtectedRegion> getRegions();
-
-    /**
-     * Set a list of protected regions.
-     * 
-     * @param regions
-     */
-    public abstract void setRegions(Map<String, ProtectedRegion> regions);
-
-    /**
-     * Adds a region.
-     * 
-     * @param region
-     */
-    public abstract void addRegion(ProtectedRegion region);
-
-    /**
-     * Return whether a region exists by an ID.
-     * 
-     * @param id
-     * @return
-     */
-    public abstract boolean hasRegion(String id);
-
-    /**
-     * Get a region by its ID.
-     * 
-     * @param id
-     * @return
-     */
-    public abstract ProtectedRegion getRegion(String id);
-
-    /**
-     * Removes a region, including inheriting children.
-     * 
-     * @param id
-     */
-    public abstract void removeRegion(String id);
-
-    /**
-     * Get an object for a point for rules to be applied with.
-     * 
-     * @param pt
-     * @return
-     */
-    public abstract ApplicableRegionSet getApplicableRegions(Vector pt);
-
-    /**
-     * Get an object for a point for rules to be applied with.
-     * 
-     * @param region
-     * @return
-     */
-    public abstract ApplicableRegionSet getApplicableRegions(
-            ProtectedRegion region);
-
-    /**
-     * Get a list of region IDs that contain a point.
-     * 
-     * @param pt
-     * @return
-     */
-    public abstract 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 abstract boolean overlapsUnownedRegion(ProtectedRegion region,
-            LocalPlayer player);
-
-    /**
-     * Get the number of regions.
-     * 
-     * @return
-     */
-    public abstract int size();
-
-    /**
-     * Get the number of regions for a player.
-     * 
-     * @param player
-     * @return
-     */
-    public abstract int getRegionCountOfPlayer(LocalPlayer player);
-}

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

@@ -1,283 +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.protection.regions;
-
-import com.sk89q.worldedit.*;
-import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 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 id
-     * @param min 
-     * @param max 
-     */
-    public ProtectedCuboidRegion(String id, BlockVector min, BlockVector max) {
-        super(id);
-        this.min = min;
-        this.max = max;
-    }
-
-    /**
-     * Get the lower point of the cuboid.
-     *
-     * @return min point
-     */
-    @Override
-    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
-     */
-    @Override
-    public BlockVector getMaximumPoint() {
-        return max;
-    }
-
-    /**
-     * Set the upper point of the cuboid.
-     *
-     * @param pt
-     */
-    public void setMaximumPoint(BlockVector pt) {
-        max = pt;
-    }
-
-    /**
-     * Checks to see if a point is inside this region.
-     */
-    @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();
-    }
-
-
-    /*
-    public boolean intersectsWith(ProtectedRegion region) throws UnsupportedIntersectionException {
-        
-        if (region instanceof ProtectedCuboidRegion) {
-            ProtectedCuboidRegion r1 = (ProtectedCuboidRegion) this;
-            ProtectedCuboidRegion r2 = (ProtectedCuboidRegion) region;
-            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 if (region instanceof ProtectedPolygonalRegion) {
-            throw new UnsupportedIntersectionException();
-        } else {
-            throw new UnsupportedIntersectionException();
-        }
-    }
-    */
-
-    @Override
-    public List<ProtectedRegion> getIntersectingRegions(List<ProtectedRegion> regions) throws UnsupportedIntersectionException {
-        int numRegions = regions.size();
-        List<ProtectedRegion> intersectingRegions = new ArrayList<ProtectedRegion>();
-        int i, i2, i3;
-
-        for (i = 0; i < numRegions; i++) {
-            ProtectedRegion region = regions.get(i);
-            BlockVector rMinPoint = region.getMinimumPoint();
-            BlockVector rMaxPoint = region.getMaximumPoint();
-
-            // Check whether the region is outside the min and max vector
-            if ((rMinPoint.getBlockX() < min.getBlockX() && rMaxPoint.getBlockX() < min.getBlockX()) 
-                            || (rMinPoint.getBlockX() > max.getBlockX() && rMaxPoint.getBlockX() > max.getBlockX())
-                    && ((rMinPoint.getBlockY() < min.getBlockY() && rMaxPoint.getBlockY() < min.getBlockY())
-                            || (rMinPoint.getBlockY() > max.getBlockY() && rMaxPoint.getBlockY() > max.getBlockY()))
-                    && ((rMinPoint.getBlockZ() < min.getBlockZ() && rMaxPoint.getBlockZ() < min.getBlockZ())
-                            || (rMinPoint.getBlockZ() > max.getBlockZ() && rMaxPoint.getBlockZ() > max.getBlockZ())) ) {
-                //intersectingRegions.add(regions.get(i));
-                continue;
-            }
-
-            // Check whether the regions points are inside the other region
-            if (region.contains(new Vector(min.getBlockX(), min.getBlockY(), min.getBlockZ()))
-                    || region.contains(new Vector(min.getBlockX(), min.getBlockY(), max.getBlockZ()))
-                    || region.contains(new Vector(min.getBlockX(), max.getBlockY(), max.getBlockZ()))
-                    || region.contains(new Vector(min.getBlockX(), max.getBlockY(), min.getBlockZ()))
-                    || region.contains(new Vector(max.getBlockX(), max.getBlockY(), max.getBlockZ()))
-                    || region.contains(new Vector(max.getBlockX(), max.getBlockY(), min.getBlockZ()))
-                    || region.contains(new Vector(max.getBlockX(), min.getBlockY(), min.getBlockZ()))
-                    || region.contains(new Vector(max.getBlockX(), min.getBlockY(), max.getBlockZ())) ) {
-                intersectingRegions.add(regions.get(i));
-                continue;
-            }
-
-            // Check whether the other regions points are inside the current region
-            if (region instanceof ProtectedPolygonalRegion) {
-                for (i2 = 0; i < ((ProtectedPolygonalRegion)region).getPoints().size(); i++) {
-                    BlockVector2D pt2Dr = ((ProtectedPolygonalRegion)region).getPoints().get(i2);
-                    int minYr = ((ProtectedPolygonalRegion)region).minY;
-                    int maxYr = ((ProtectedPolygonalRegion)region).maxY;
-                    Vector ptr = new Vector(pt2Dr.getBlockX(), minYr, pt2Dr.getBlockZ());
-                    Vector ptr2 = new Vector(pt2Dr.getBlockX(), maxYr, pt2Dr.getBlockZ());
-
-                    if (this.contains(ptr) || this.contains(ptr2)) {
-                        intersectingRegions.add(regions.get(i));
-                        continue;
-                    }
-                }
-            } else if (region instanceof ProtectedCuboidRegion) {
-                BlockVector ptcMin = region.getMinimumPoint(); 
-                BlockVector ptcMax = region.getMaximumPoint();
-
-                if (this.contains(new Vector(ptcMin.getBlockX(), ptcMin.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMin.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMax.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMax.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMax.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMax.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMin.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMin.getBlockY(), ptcMax.getBlockZ())) ) {
-                    intersectingRegions.add(regions.get(i));
-                    continue;
-                }
-            } else {
-                throw new UnsupportedOperationException("Not supported yet."); 
-            }
-
-            // Check whether the current regions edges collide with the regions edges
-            boolean regionIsIntersecting = false;
-            List<BlockVector2D> points = new ArrayList<BlockVector2D>();
-            points.add(new BlockVector2D(min.getBlockX(), min.getBlockZ()));
-            points.add(new BlockVector2D(min.getBlockX(), max.getBlockZ()));
-            points.add(new BlockVector2D(max.getBlockX(), max.getBlockZ()));
-            points.add(new BlockVector2D(max.getBlockX(), min.getBlockZ()));
-
-            for (i2 = 0; i2 < points.size(); i2++) {
-                boolean checkNextPoint = false;
-                BlockVector2D currPoint = points.get(i2);
-                BlockVector2D nextPoint;
-
-                if (i2 == (points.size() - 1)) {
-                    nextPoint = points.get(0);
-                } else {
-                    nextPoint = points.get(i2 + 1);
-                }
-
-                int currX = currPoint.getBlockX();
-                int currZ = currPoint.getBlockZ();
-                while (!checkNextPoint) {
-                    for(i3 = min.getBlockY(); i3 <= max.getBlockY(); i3++) {
-                        if (region.contains(new Vector(currX, i3, currZ))) {
-                            intersectingRegions.add(regions.get(i));
-                            regionIsIntersecting = true;
-                            break;
-                        }
-                    }
-
-                    if (currX == nextPoint.getBlockX() || currZ == nextPoint.getBlockZ() || regionIsIntersecting) {
-                        checkNextPoint = true;
-                    }
-
-                    if (nextPoint.getBlockX() > currPoint.getBlockX()) {
-                        currX++;
-                    } else {
-                        currX--;
-                    }
-                    if (nextPoint.getBlockZ() > currPoint.getBlockZ()) {
-                        currZ++;
-                    } else {
-                        currZ--;
-                    }
-                }
-
-                if (regionIsIntersecting) {
-                    break;
-                }
-            }
-        }
-
-        return intersectingRegions;
-    }
-
-
-    /**
-     * Return the type of region as a user-friendly name.
-     * 
-     * @return type of region
-     */
-    @Override
-    public String getTypeName() {
-        return "cuboid";
-    }
-
-    /**
-     * Get the number of Blocks in this region
-     * 
-     * @return
-     */
-    @Override
-    public int volume() {
-        int xLength = max.getBlockX() - min.getBlockX() + 1;
-        int yLength = max.getBlockY() - min.getBlockY() + 1;
-        int zLength = max.getBlockZ() - min.getBlockZ() + 1;
-
-        int volume = xLength * yLength * zLength;
-        return volume;
-    }
-
-
-}

src/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java

@@ -1,309 +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.protection.regions;
-
-import java.util.List;
-import java.util.ArrayList;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.BlockVector2D;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
-
-public class ProtectedPolygonalRegion extends ProtectedRegion {
-
-    protected List<BlockVector2D> points;
-    protected int minY;
-    protected int maxY;
-    private BlockVector min;
-    private BlockVector max;
-
-    public ProtectedPolygonalRegion(String id, List<BlockVector2D> points, int minY, int maxY) {
-        super(id);
-        this.points = points;
-        this.minY = minY;
-        this.maxY = maxY;
-
-        int minX = points.get(0).getBlockX();
-        int minZ = points.get(0).getBlockZ();
-        int maxX = points.get(0).getBlockX();
-        int maxZ = points.get(0).getBlockZ();
-
-        for (BlockVector2D v : points) {
-            int x = v.getBlockX();
-            int z = v.getBlockZ();
-            if (x < minX) {
-                minX = x;
-            }
-            if (z < minZ) {
-                minZ = z;
-            }
-            if (x > maxX) {
-                maxX = x;
-            }
-            if (z > maxZ) {
-                maxZ = z;
-            }
-        }
-
-        min = new BlockVector(minX, minY, minZ);
-        max = new BlockVector(maxX, maxY, maxZ);
-    }
-
-    public List<BlockVector2D> getPoints() {
-        return points;
-    }
-
-    @Override
-    public BlockVector getMinimumPoint() {
-        return min;
-    }
-
-    @Override
-    public BlockVector getMaximumPoint() {
-        return max;
-    }
-
-    /**
-     * Checks to see if a point is inside this region.
-     */
-    @Override
-    public boolean contains(Vector pt) {
-        int targetX = pt.getBlockX(); //wide
-        int targetY = pt.getBlockY(); //height
-        int targetZ = pt.getBlockZ(); //depth
-
-        if (targetY < minY || targetY > maxY) {
-            return false;
-        }
-        //Quick and dirty check.
-        if (targetX < min.getBlockX() || targetX > max.getBlockX() || targetZ < min.getBlockZ() || targetZ > max.getBlockZ()) {
-            return false;
-        }
-        boolean inside = false;
-        int npoints = points.size();
-        int xNew, zNew;
-        int xOld, zOld;
-        int x1, z1;
-        int x2, z2;
-        int i;
-
-        xOld = points.get(npoints - 1).getBlockX();
-        zOld = points.get(npoints - 1).getBlockZ();
-
-        for (i = 0; i < npoints; i++) {
-            xNew = points.get(i).getBlockX();
-            zNew = points.get(i).getBlockZ();
-            //Check for corner
-            if (xNew == targetX && zNew == targetZ) {
-                return true;
-            }
-            if (xNew > xOld) {
-                x1 = xOld;
-                x2 = xNew;
-                z1 = zOld;
-                z2 = zNew;
-            } else {
-                x1 = xNew;
-                x2 = xOld;
-                z1 = zNew;
-                z2 = zOld;
-            }
-            if ((xNew < targetX) == (targetX <= xOld)
-                    && ((long) targetZ - (long) z1) * (long) (x2 - x1) <= ((long) z2 - (long) z1)
-                    * (long) (targetX - x1)) {
-                inside = !inside;
-            }
-            xOld = xNew;
-            zOld = zNew;
-        }
-
-        return inside;
-    }
-
-    @Override
-    public List<ProtectedRegion> getIntersectingRegions(List<ProtectedRegion> regions) throws UnsupportedIntersectionException {
-        int numRegions = regions.size();
-        int numPoints = points.size();
-        List<ProtectedRegion> intersectingRegions = new ArrayList<ProtectedRegion>();
-        int i, i2, i3;
-
-        for (i = 0; i < numRegions; i++) {
-            ProtectedRegion region = regions.get(i);
-            BlockVector rMinPoint = region.getMinimumPoint();
-            BlockVector rMaxPoint = region.getMaximumPoint();
-
-            // Check whether the region is outside the min and max vector
-            if ((rMinPoint.getBlockX() < min.getBlockX() && rMaxPoint.getBlockX() < min.getBlockX()) 
-                            || (rMinPoint.getBlockX() > max.getBlockX() && rMaxPoint.getBlockX() > max.getBlockX())
-                    && ((rMinPoint.getBlockY() < min.getBlockY() && rMaxPoint.getBlockY() < min.getBlockY())
-                            || (rMinPoint.getBlockY() > max.getBlockY() && rMaxPoint.getBlockY() > max.getBlockY()))
-                    && ((rMinPoint.getBlockZ() < min.getBlockZ() && rMaxPoint.getBlockZ() < min.getBlockZ())
-                            || (rMinPoint.getBlockZ() > max.getBlockZ() && rMaxPoint.getBlockZ() > max.getBlockZ())) ) {
-                intersectingRegions.add(regions.get(i));
-                continue;
-            }
-
-            // Check whether the regions points are inside the other region
-            for (i2 = 0; i < numPoints; i++) {
-                Vector pt = new Vector(points.get(i2).getBlockX(), minY, points.get(i2).getBlockZ());
-                Vector pt2 = new Vector(points.get(i2).getBlockX(), maxY, points.get(i2).getBlockZ());
-                if (region.contains(pt) || region.contains(pt2)) {
-                    intersectingRegions.add(regions.get(i));
-                    continue;
-                }
-            }
-
-            // Check whether the other regions points are inside the current region
-            if (region instanceof ProtectedPolygonalRegion) {
-                for (i2 = 0; i < ((ProtectedPolygonalRegion)region).getPoints().size(); i++) {
-                    BlockVector2D pt2Dr = ((ProtectedPolygonalRegion)region).getPoints().get(i2);
-                    int minYr = ((ProtectedPolygonalRegion)region).minY;
-                    int maxYr = ((ProtectedPolygonalRegion)region).maxY;
-                    Vector ptr = new Vector(pt2Dr.getBlockX(), minYr, pt2Dr.getBlockZ());
-                    Vector ptr2 = new Vector(pt2Dr.getBlockX(), maxYr, pt2Dr.getBlockZ());
-
-                    if (this.contains(ptr) || this.contains(ptr2)) {
-                        intersectingRegions.add(regions.get(i));
-                        continue;
-                    }
-                }
-            } else if (region instanceof ProtectedCuboidRegion) {
-                BlockVector ptcMin = region.getMinimumPoint(); 
-                BlockVector ptcMax = region.getMaximumPoint();
-
-                if (this.contains(new Vector(ptcMin.getBlockX(), ptcMin.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMin.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMax.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMax.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMax.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMax.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMin.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMin.getBlockY(), ptcMax.getBlockZ())) ) {
-                    intersectingRegions.add(regions.get(i));
-                    continue;
-                }
-            } else {
-                throw new UnsupportedOperationException("Not supported yet."); 
-            }
-
-            // Check whether the current regions edges collide with the regions edges
-            boolean regionIsIntersecting = false;
-            for (i2 = 0; i2 < numPoints; i2++) {
-                boolean checkNextPoint = false;
-                BlockVector2D currPoint = points.get(i2);
-                BlockVector2D nextPoint;
-
-                if (i2 == (numPoints - 1)) {
-                    nextPoint = points.get(0);
-                } else {
-                    nextPoint = points.get(i2 + 1);
-                }
-
-                int currX = currPoint.getBlockX();
-                int currZ = currPoint.getBlockZ();
-
-                while (!checkNextPoint) {
-                    for(i3 = this.minY; i3 <= this.maxY; i3++) {
-                        if (region.contains(new Vector(currX, i3, currZ))) {
-                            intersectingRegions.add(regions.get(i));
-                            regionIsIntersecting = true;
-                            break;
-                        }
-                    }
-
-                    if (currX == nextPoint.getBlockX() || currZ == nextPoint.getBlockZ() || regionIsIntersecting) {
-                        checkNextPoint = true;
-                    }
-
-                    if (nextPoint.getBlockX() > currPoint.getBlockX()) {
-                        currX++;
-                    } else {
-                        currX--;
-                    }
-                    if (nextPoint.getBlockZ() > currPoint.getBlockZ()) {
-                        currZ++;
-                    } else {
-                        currZ--;
-                    }
-                }
-
-                if (regionIsIntersecting) {
-                    break;
-                }
-            }
-        }
-
-        return intersectingRegions;
-    }
-
-
-    /**
-     * Return the type of region as a user-friendly name.
-     * 
-     * @return type of region
-     */
-    @Override
-    public String getTypeName() {
-        return "polygon";
-    }
-
-    /**
-     * Get the number of Blocks in this region
-     * 
-     * @return
-     */
-    @Override
-    public int volume() {
-        int volume = 0;
-        int numPoints = points.size();
-        if (numPoints < 3) {
-            return 0;
-        }
-
-        double area = 0;
-        int xa, za, z1, z2;
-
-        for (int i = 0; i <= numPoints - 1; i++) {
-            xa = points.get(i).getBlockX();
-            za = points.get(i).getBlockZ();
-
-            if (points.get(i + 1) == null) {
-                z1 = points.get(0).getBlockZ();
-            } else {
-                z1 = points.get(i + 1).getBlockZ();
-            }
-            if (points.get(i - 1) == null) {
-                z2 = points.get(numPoints - 1).getBlockZ();
-            } else {
-                z2 = points.get(i - 1).getBlockZ();
-            }
-
-            area = area + (xa * (z1 - z2));
-        }
-
-        xa = points.get(0).getBlockX();
-        za = points.get(0).getBlockZ();
-
-        area = area + (xa * (points.get(1).getBlockZ() - points.get(numPoints - 1).getBlockZ()));
-
-        volume = (Math.abs(maxY - minY) + 1) * (int) Math.ceil((Math.abs(area) / 2));
-
-        return volume;
-    }
-}

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

@@ -1,339 +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.protection.regions;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
-import com.sk89q.worldguard.protection.flags.Flag;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * Represents a region of any shape and size that can be protected.
- * 
- * @author sk89q
- */
-public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
-    
-    private static final Pattern idPattern = Pattern.compile("^[A-Za-z0-9_,'\\-\\+/]{1,}$");
-    
-    /**
-     * Holds the region's ID.
-     */
-    private String id;
-    /**
-     * Priority.
-     */
-    private int priority = 0;
-    /**
-     * Holds the curParent.
-     */
-    private ProtectedRegion parent;
-    /**
-     * List of owners.
-     */
-    private DefaultDomain owners = new DefaultDomain();
-    /**
-     * List of members.
-     */
-    private DefaultDomain members = new DefaultDomain();
-    /**
-     * List of flags.
-     */
-    private Map<Flag<?>, Object> flags = new HashMap<Flag<?>, Object>();
-
-    /**
-     * Construct a new instance of this region.
-     *
-     * @param id
-     */
-    public ProtectedRegion(String id) {
-        this.id = id;
-    }
-
-    /**
-     * @return the id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Get the lower point of the cuboid.
-     *
-     * @return min point
-     */
-    public abstract BlockVector getMinimumPoint();
-
-    /**
-     * Get the upper point of the cuboid.
-     *
-     * @return max point
-     */
-    public abstract BlockVector getMaximumPoint();
-
-    /**
-     * @return the priority
-     */
-    public int getPriority() {
-        return priority;
-    }
-
-    /**
-     * @param priority the priority to setFlag
-     */
-    public void setPriority(int priority) {
-        this.priority = priority;
-    }
-    
-    /**
-     * @return the curParent
-     */
-    public ProtectedRegion getParent() {
-        return parent;
-    }
-
-    /**
-     * Set the curParent. This checks to make sure that it will not result
-     * in circular inheritance.
-     * 
-     * @param parent the curParent to setFlag
-     * @throws CircularInheritanceException 
-     */
-    public void setParent(ProtectedRegion parent) throws CircularInheritanceException {
-        if (parent == null) {
-            this.parent = null;
-            return;
-        }
-        
-        if (parent == this) {
-            throw new CircularInheritanceException();
-        }
-        
-        ProtectedRegion p = parent.getParent();
-        while (p != null) {
-            if (p == this) {
-                throw new CircularInheritanceException();
-            }
-            p = p.getParent();
-        }
-        
-        this.parent = parent;
-    }
-
-
-    /**
-     * @return the owners
-     */
-    public DefaultDomain getOwners() {
-
-        return owners;
-    }
-
-    /**
-     * @param owners the owners to setFlag
-     */
-    public void setOwners(DefaultDomain owners) {
-        this.owners = owners;
-    }
-
-    /**
-     * @return the members
-     */
-    public DefaultDomain getMembers() {
-
-        return members;
-    }
-
-    /**
-     * @param members the members to setFlag
-     */
-    public void setMembers(DefaultDomain members) {
-        this.members = members;
-    }
-    
-    /**
-     * Checks whether a player is an owner of region or any of its parents.
-     * 
-     * @param player
-     * @return
-     */
-    public boolean isOwner(LocalPlayer player) {
-        if (owners.contains(player)) {
-            return true;
-        }
-        
-        ProtectedRegion curParent = getParent();
-        while (curParent != null) {
-            if (curParent.getOwners().contains(player)) {
-                return true;
-            }
-            
-            curParent = curParent.getParent();
-        }
-        
-        return false;
-    }
-
-
-    /**
-     * Checks whether a player is a member of the region or any of its parents.
-     * 
-     * @param player
-     * @return
-     */
-    public boolean isMember(LocalPlayer player) {
-        if (owners.contains(player) || members.contains(player)) {
-            return true;
-        }
-        
-        ProtectedRegion curParent = getParent();
-        while (curParent != null) {
-            if (curParent.getOwners().contains(player)
-                    || curParent.getMembers().contains(player)) {
-                return true;
-            }
-            
-            curParent = curParent.getParent();
-        }
-        
-        return false;
-    }
-    
-    /**
-     * Get a flag's value.
-     * 
-     * @param <T>
-     * @param <V>
-     * @param flag
-     * @return value or null if isn't defined
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends Flag<V>, V> V getFlag(T flag) {
-        Object obj = flags.get(flag);
-        V val;
-        if (obj != null) {
-            val = (V) obj;
-        } else {
-            return null;
-        }
-        return val;
-    }
-    
-    /**
-     * Set a flag's value.
-     * 
-     * @param <T>
-     * @param <V>
-     * @param flag
-     * @param val
-     */
-    public <T extends Flag<V>, V> void setFlag(T flag, V val) {
-        if (val == null) {
-            flags.remove(flag);
-        } else {
-            flags.put(flag, val);
-        }
-    }
-    
-    /**
-     * Get the map of flags.
-     * 
-     * @return
-     */
-    public Map<Flag<?>, Object> getFlags() {
-        return flags;
-    }
-    
-    /**
-     * Get the map of flags.
-     * 
-     * @param flags 
-     */
-    public void setFlags(Map<Flag<?>, Object> flags) {
-        this.flags = flags;
-    }
-
-    /**
-     * Get the number of blocks in this region
-     * 
-     * @return
-     */
-    public abstract int volume();
-    
-    /**
-     * Check to see if a point is inside this region.
-     * 
-     * @param pt
-     * @return
-     */
-    public abstract boolean contains(Vector pt);
-    
-    /**
-     * Compares to another region.
-     * 
-     * @param other
-     * @return
-     */
-    public int compareTo(ProtectedRegion other) {
-        if (priority == other.priority) {
-            return 0;
-        } else if (priority > other.priority) {
-            return -1;
-        } else {
-            return 1;
-        }
-    }
-
-    /**
-     * Return the type of region as a user-friendly, lowercase name.
-     * 
-     * @return type of region
-     */
-    public abstract String getTypeName();
-
-    public abstract List<ProtectedRegion> getIntersectingRegions(
-            List<ProtectedRegion> regions)
-            throws UnsupportedIntersectionException;
-    
-    /**
-     * Checks to see if the given ID is accurate.
-     * 
-     * @param id
-     * @return
-     */
-    public static boolean isValidId(String id) {
-        return idPattern.matcher(id).matches();
-    }
-    
-    /**
-     * Thrown when setting a curParent would create a circular inheritance
-     * situation.
-     * 
-     */
-    public static class CircularInheritanceException extends Exception {
-        private static final long serialVersionUID = 7479613488496776022L;
-    }
-}

src/com/sk89q/worldguard/util/yaml/Configuration.java

@@ -1,156 +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.util.yaml;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.HashMap;
-import java.util.Map;
-import com.sk89q.worldguard.util.yaml.ConfigurationException;
-import com.sk89q.worldguard.util.yaml.ConfigurationNode;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.SafeConstructor;
-import org.yaml.snakeyaml.reader.UnicodeReader;
-import org.yaml.snakeyaml.representer.Representer;
-
-/**
- * YAML configuration loader. To use this class, construct it with path to
- * a file and call its load() method. For specifying node paths in the
- * various get*() methods, they support SK's path notation, allowing you to
- * select child nodes by delimiting node names with periods.
- * 
- * <p>
- * For example, given the following configuration file:</p>
- * 
- * <pre>members:
- *     - Hollie
- *     - Jason
- *     - Bobo
- *     - Aya
- *     - Tetsu
- * worldguard:
- *     fire:
- *         spread: false
- *         blocks: [cloth, rock, glass]
- * sturmeh:
- *     cool: false
- *     eats:
- *         babies: true</pre>
- * 
- * <p>Calling code could access sturmeh's baby eating state by using
- * <code>getBoolean("sturmeh.eats.babies", false)</code>. For lists, there are
- * methods such as <code>getStringList</code> that will return a type safe list.
- * 
- * <p>This class is currently incomplete. It is not yet possible to get a node.
- * </p>
- * 
- * @author sk89q
- */
-public class Configuration extends ConfigurationNode {
-    private Yaml yaml;
-    private File file;
-    
-    public Configuration(File file) {
-        super(new HashMap<String, Object>());
-        
-        DumperOptions options = new DumperOptions();
-        options.setIndent(2);
-        options.setDefaultFlowStyle(DumperOptions.FlowStyle.AUTO);
-
-        yaml = new Yaml(new SafeConstructor(), new Representer(), options);
-        
-        this.file = file;
-    }
-    
-    /**
-     * Loads the configuration file.
-     * 
-     * @throws IOException 
-     */
-    public void load() throws IOException {        
-        FileInputStream stream = null;
-        
-        try {
-            stream = new FileInputStream(file);
-            read(yaml.load(new UnicodeReader(stream)));
-        } catch (ConfigurationException e) {
-            root = new HashMap<String, Object>();
-        } finally {
-            try {
-                if (stream != null) {
-                    stream.close();
-                }
-            } catch (IOException e) {
-            }
-        }
-    }
-    
-    /**
-     * Saves the configuration to disk.  
-     *  
-     * @throws IOException 
-     */
-    public void save() throws IOException {
-        FileOutputStream stream = null;
-        
-        File parent = file.getParentFile();
-        if (parent != null) {
-            parent.mkdirs();
-        }
-        
-        try {
-            stream = new FileOutputStream(file);
-            yaml.dump(root, new OutputStreamWriter(stream, "UTF-8"));
-        } finally {
-            try {
-                if (stream != null) {
-                    stream.close();
-                }
-            } catch (IOException e) {
-            }
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    private void read(Object input) throws ConfigurationException {
-        try {
-            if ( null == input ) {
-                root = new HashMap<String, Object>();
-            } else {
-                root = (Map<String, Object>)input;
-            }
-        } catch (ClassCastException e) {
-            throw new ConfigurationException("Root document must be an key-value structure");
-        }
-    }
-    
-    /**
-     * This method returns an empty ConfigurationNode for using as a 
-     * default in methods that select a node from a node list.
-     * @return
-     */
-    public static ConfigurationNode getEmptyNode() {
-        return new ConfigurationNode(new HashMap<String, Object>());
-    }
-}

src/com/sk89q/worldguard/util/yaml/ConfigurationNode.java

@@ -1,795 +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.util.yaml;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.sk89q.worldedit.BlockVector2D;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.Vector2D;
-import com.sk89q.worldguard.util.yaml.ConfigurationNode;
-
-/**
- * Represents a configuration node.
- * 
- * @author sk89q
- */
-public class ConfigurationNode {
-    protected Map<String, Object> root;
-    
-    protected ConfigurationNode(Map<String, Object> root) {
-        this.root = root;
-    }
-    
-    /**
-     * Clear all nodes.
-     */
-    public void clear() {
-        root.clear();
-    }
-    
-    /**
-     * Gets a property at a location. This will either return an Object
-     * or null, with null meaning that no configuration value exists at
-     * that location. This could potentially return a default value (not yet
-     * implemented) as defined by a plugin, if this is a plugin-tied
-     * configuration.
-     * 
-     * @param path path to node (dot notation)
-     * @return object or null
-     */
-    @SuppressWarnings("unchecked")
-    public Object getProperty(String path) {
-        if (!path.contains(".")) {
-            Object val = root.get(path);
-            if (val == null) {
-                return null;
-            }
-            return val;
-        }
-        
-        String[] parts = path.split("\\.");
-        Map<String, Object> node = root;
-        
-        for (int i = 0; i < parts.length; i++) {
-            Object o = node.get(parts[i]);
-            
-            if (o == null) {
-                return null;
-            }
-            
-            if (i == parts.length - 1) {
-                return o;
-            }
-            
-            try {
-                node = (Map<String, Object>)o;
-            } catch (ClassCastException e) {
-                return null;
-            }
-        }
-        
-        return null;
-    }
-    
-    /**
-     * Prepare a value for serialization, in case it's not a native type
-     * (and we don't want to serialize objects as YAML objects).
-     * 
-     * @param value
-     * @return
-     */
-    private Object prepareSerialization(Object value) {
-        if (value instanceof Vector) {
-            Map<String, Double> out = new HashMap<String, Double>();
-            Vector vec = (Vector) value;
-            out.put("x", vec.getX());
-            out.put("y", vec.getY());
-            out.put("z", vec.getZ());
-            return out;
-        }
-        
-        return value;
-    }
-    
-    /**
-     * Set the property at a location. This will override existing
-     * configuration data to have it conform to key/value mappings.
-     * 
-     * @param path
-     * @param value
-     */
-    @SuppressWarnings("unchecked")
-    public void setProperty(String path, Object value) {
-        value = prepareSerialization(value);
-        
-        if (!path.contains(".")) {
-            root.put(path, value);
-            return;
-        }
-        
-        String[] parts = path.split("\\.");
-        Map<String, Object> node = root;
-        
-        for (int i = 0; i < parts.length; i++) {
-            Object o = node.get(parts[i]);
-            
-            // Found our target!
-            if (i == parts.length - 1) {
-                node.put(parts[i], value);
-                return;
-            }
-            
-            if (o == null || !(o instanceof Map)) {
-                // This will override existing configuration data!
-                o = new HashMap<String, Object>();
-                node.put(parts[i], o);
-            }
-            
-            node = (Map<String, Object>)o;
-        }
-    }
-    
-    /**
-     * Adds a new node to the given path. The returned object is a reference
-     * to the new node. This method will replace an existing node at
-     * the same path. See <code>setProperty</code>.
-     * 
-     * @param path
-     * @return
-     */
-    public ConfigurationNode addNode(String path) {
-        Map<String, Object> map = new HashMap<String, Object>();
-        ConfigurationNode node = new ConfigurationNode(map);
-        setProperty(path, map);
-        return node;
-    }
-
-    /**
-     * Gets a string at a location. This will either return an String
-     * or null, with null meaning that no configuration value exists at
-     * that location. If the object at the particular location is not actually
-     * a string, it will be converted to its string representation.
-     * 
-     * @param path path to node (dot notation)
-     * @return string or null
-     */
-    public String getString(String path) {
-        Object o = getProperty(path);
-        if (o == null) {
-            return null;
-        }
-        return o.toString();
-    }
-
-    /**
-     * Gets a vector at a location. This will either return an Vector
-     * or a null. If the object at the particular location is not
-     * actually a string, it will be converted to its string representation.
-     * 
-     * @param path path to node (dot notation)
-     * @return string or default
-     */
-    public Vector getVector(String path) {
-        ConfigurationNode o = getNode(path);
-        if (o == null) {
-            return null;
-        }
-        
-        Double x = o.getDouble("x");
-        Double y = o.getDouble("y");
-        Double z = o.getDouble("z");
-        
-        if (x == null || y == null || z == null) {
-            return null;
-        }
-        
-        return new Vector(x, y, z);
-    }
-
-    /**
-     * Gets a 2D vector at a location. This will either return an Vector
-     * or a null. If the object at the particular location is not
-     * actually a string, it will be converted to its string representation.
-     * 
-     * @param path path to node (dot notation)
-     * @return string or default
-     */
-    public Vector2D getVector2d(String path) {
-        ConfigurationNode o = getNode(path);
-        if (o == null) {
-            return null;
-        }
-        
-        Double x = o.getDouble("x");
-        Double z = o.getDouble("z");
-        
-        if (x == null || z == null) {
-            return null;
-        }
-        
-        return new Vector2D(x, z);
-    }
-
-    /**
-     * Gets a string at a location. This will either return an Vector
-     * or the default value. If the object at the particular location is not
-     * actually a string, it will be converted to its string representation.
-     * 
-     * @param path path to node (dot notation)
-     * @param def default value
-     * @return string or default
-     */
-    public Vector getVector(String path, Vector def) {
-        Vector v = getVector(path);
-        if (v == null) {
-            setProperty(path, def);
-            return def;
-        }
-        return v;
-    }
-
-    /**
-     * Gets a string at a location. This will either return an String
-     * or the default value. If the object at the particular location is not
-     * actually a string, it will be converted to its string representation.
-     * 
-     * @param path path to node (dot notation)
-     * @param def default value
-     * @return string or default
-     */
-    public String getString(String path, String def) {
-        String o = getString(path);
-        if (o == null) {
-            setProperty(path, def);
-            return def;
-        }
-        return o;
-    }
-
-    /**
-     * Gets an integer at a location. This will either return an integer
-     * or null. If the object at the particular location is not
-     * actually a integer, the default value will be returned. However, other
-     * number types will be casted to an integer.
-     * 
-     * @param path path to node (dot notation)
-     * @return integer or null
-     */
-    public Integer getInt(String path) {
-        Integer o = castInt(getProperty(path));
-        if (o == null) {
-            return null;
-        } else {
-            return o;
-        }
-    }
-
-    /**
-     * Gets an integer at a location. This will either return an integer
-     * or the default value. If the object at the particular location is not
-     * actually a integer, the default value will be returned. However, other
-     * number types will be casted to an integer.
-     * 
-     * @param path path to node (dot notation)
-     * @param def default value
-     * @return int or default
-     */
-    public int getInt(String path, int def) {
-        Integer o = castInt(getProperty(path));
-        if (o == null) {
-            setProperty(path, def);
-            return def;
-        } else {
-            return o;
-        }
-    }
-
-    /**
-     * Gets a double at a location. This will either return an double
-     * or null. If the object at the particular location is not
-     * actually a double, the default value will be returned. However, other
-     * number types will be casted to an double.
-     * 
-     * @param path path to node (dot notation)
-     * @return double or null
-     */
-    public Double getDouble(String path) {
-        Double o = castDouble(getProperty(path));
-        if (o == null) {
-            return null;
-        } else {
-            return o;
-        }
-    }
-
-    /**
-     * Gets a double at a location. This will either return an double
-     * or the default value. If the object at the particular location is not
-     * actually a double, the default value will be returned. However, other
-     * number types will be casted to an double.
-     * 
-     * @param path path to node (dot notation)
-     * @param def default value
-     * @return double or default
-     */
-    public double getDouble(String path, double def) {
-        Double o = castDouble(getProperty(path));
-        if (o == null) {
-            setProperty(path, def);
-            return def;
-        } else {
-            return o;
-        }
-    }
-
-    /**
-     * Gets a boolean at a location. This will either return an boolean
-     * or null. If the object at the particular location is not
-     * actually a boolean, the default value will be returned.
-     * 
-     * @param path path to node (dot notation)
-     * @return boolean or null
-     */
-    public Boolean getBoolean(String path) {
-        Boolean o = castBoolean(getProperty(path));
-        if (o == null) {
-            return null;
-        } else {
-            return o;
-        }
-    }
-
-    /**
-     * Gets a boolean at a location. This will either return an boolean
-     * or the default value. If the object at the particular location is not
-     * actually a boolean, the default value will be returned.
-     * 
-     * @param path path to node (dot notation)
-     * @param def default value
-     * @return boolean or default
-     */
-    public boolean getBoolean(String path, boolean def) {
-        Boolean o = castBoolean(getProperty(path));
-        if (o == null) {
-            setProperty(path, def);
-            return def;
-        } else {
-            return o;
-        }
-    }
-    
-    /**
-     * Get a list of keys at a location. If the map at the particular location
-     * does not exist or it is not a map, null will be returned.
-     * 
-     * @param path path to node (dot notation)
-     * @return list of keys
-     */
-    @SuppressWarnings("unchecked")
-    public List<String> getKeys(String path) {
-        if (path == null) return new ArrayList<String>(root.keySet());
-        Object o = getProperty(path);
-        if (o == null) {
-            return null;
-        } else if (o instanceof Map) {
-            return new ArrayList<String>(((Map<String,Object>)o).keySet());
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets a list of objects at a location. If the list is not defined,
-     * null will be returned. The node must be an actual list.
-     * 
-     * @param path path to node (dot notation)
-     * @return boolean or default
-     */
-    @SuppressWarnings("unchecked")
-    public List<Object> getList(String path) {
-        Object o = getProperty(path);
-        if (o == null) {
-            return null;
-        } else if (o instanceof List) {
-            return (List<Object>)o;
-        } else {
-            return null;
-        }
-    }
-    
-    /**
-     * Gets a list of strings. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. If an item in the list
-     * is not a string, it will be converted to a string. The node must be
-     * an actual list and not just a string.
-     *  
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of strings
-     */
-    public List<String> getStringList(String path, List<String> def) {
-        List<Object> raw = getList(path);
-        if (raw == null) {
-            return def != null ? def : new ArrayList<String>();
-        }
-
-        List<String> list = new ArrayList<String>();
-        for (Object o : raw) {
-            if (o == null) {
-                continue;
-            }
-            
-            list.add(o.toString());
-        }
-        
-        return list;
-    }
-    
-    /**
-     * Gets a list of integers. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual list and not just an integer.
-     *  
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    public List<Integer> getIntList(String path, List<Integer> def) {
-        List<Object> raw = getList(path);
-        if (raw == null) {
-            return def != null ? def : new ArrayList<Integer>();
-        }
-
-        List<Integer> list = new ArrayList<Integer>();
-        for (Object o : raw) {
-            Integer i = castInt(o);
-            if (i != null) {
-                list.add(i);
-            }
-        }
-        
-        return list;
-    }
-    
-    /**
-     * Gets a list of doubles. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual list and cannot be just a double.
-     *  
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    public List<Double> getDoubleList(String path, List<Double> def) {
-        List<Object> raw = getList(path);
-        if (raw == null) {
-            return def != null ? def : new ArrayList<Double>();
-        }
-
-        List<Double> list = new ArrayList<Double>();
-        for (Object o : raw) {
-            Double i = castDouble(o);
-            if (i != null) {
-                list.add(i);
-            }
-        }
-        
-        return list;
-    }
-    
-    /**
-     * Gets a list of booleans. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual list and cannot be just a boolean,
-     *  
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    public List<Boolean> getBooleanList(String path, List<Boolean> def) {
-        List<Object> raw = getList(path);
-        if (raw == null) {
-            return def != null ? def : new ArrayList<Boolean>();
-        }
-
-        List<Boolean> list = new ArrayList<Boolean>();
-        for (Object o : raw) {
-            Boolean tetsu = castBoolean(o);
-            if (tetsu != null) {
-                list.add(tetsu);
-            }
-        }
-        
-        return list;
-    }
-    
-    /**
-     * Gets a list of vectors. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual node and cannot be just a vector,
-     *  
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    public List<Vector> getVectorList(
-            String path, List<Vector> def) {
-        
-        List<ConfigurationNode> raw = getNodeList(path, null);
-        List<Vector> list = new ArrayList<Vector>();
-        
-        for (ConfigurationNode o : raw) {
-            Double x = o.getDouble("x");
-            Double y = o.getDouble("y");
-            Double z = o.getDouble("z");
-            
-            if (x == null || y == null || z == null) {
-                continue;
-            }
-            
-            list.add(new Vector(x, y, z));
-        }
-        
-        return list;
-    }
-    
-    /**
-     * Gets a list of 2D vectors. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual node and cannot be just a vector,
-     *  
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    public List<Vector2D> getVector2dList(
-            String path, List<Vector2D> def) {
-        
-        List<ConfigurationNode> raw = getNodeList(path, null);
-        List<Vector2D> list = new ArrayList<Vector2D>();
-        
-        for (ConfigurationNode o : raw) {
-            Double x = o.getDouble("x");
-            Double z = o.getDouble("z");
-            
-            if (x == null || z == null) {
-                continue;
-            }
-            
-            list.add(new Vector2D(x, z));
-        }
-        
-        return list;
-    }
-    
-    /**
-     * Gets a list of 2D vectors. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual node and cannot be just a vector,
-     *  
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    public List<BlockVector2D> getBlockVector2dList(
-            String path, List<BlockVector2D> def) {
-        
-        List<ConfigurationNode> raw = getNodeList(path, null);
-        List<BlockVector2D> list = new ArrayList<BlockVector2D>();
-        
-        for (ConfigurationNode o : raw) {
-            Double x = o.getDouble("x");
-            Double z = o.getDouble("z");
-            
-            if (x == null || z == null) {
-                continue;
-            }
-            
-            list.add(new BlockVector2D(x, z));
-        }
-        
-        return list;
-    }
-    
-    /**
-     * Gets a list of nodes. Non-valid entries will not be in the list.
-     * There will be no null slots. If the list is not defined, the
-     * default will be returned. 'null' can be passed for the default
-     * and an empty list will be returned instead. The node must be
-     * an actual node and cannot be just a boolean,
-     *  
-     * @param path path to node (dot notation)
-     * @param def default value or null for an empty list as default
-     * @return list of integers
-     */
-    @SuppressWarnings("unchecked")
-    public List<ConfigurationNode> getNodeList(String path, List<ConfigurationNode> def) {
-        List<Object> raw = getList(path);
-        if (raw == null) {
-            return def != null ? def : new ArrayList<ConfigurationNode>();
-        }
-
-        List<ConfigurationNode> list = new ArrayList<ConfigurationNode>();
-        for (Object o : raw) {
-            if (o instanceof Map) {
-                list.add(new ConfigurationNode((Map<String, Object>)o));
-            }
-        }
-        
-        return list;
-    }
-    
-    /**
-     * Get a configuration node at a path. If the node doesn't exist or the
-     * path does not lead to a node, null will be returned. A node has
-     * key/value mappings.
-     * 
-     * @param path
-     * @return node or null
-     */
-    @SuppressWarnings("unchecked")
-    public ConfigurationNode getNode(String path) {
-        Object raw = getProperty(path);
-        if (raw instanceof Map) {
-            return new ConfigurationNode((Map<String, Object>)raw);
-        }
-        
-        return null;
-    }
-    
-    /**
-     * Get a list of nodes at a location. If the map at the particular location
-     * does not exist or it is not a map, null will be returned.
-     * 
-     * @param path path to node (dot notation)
-     * @return map of nodes
-     */
-    @SuppressWarnings("unchecked")
-    public Map<String, ConfigurationNode> getNodes(String path) {
-        Object o = getProperty(path);
-        if (o == null) {
-            return null;
-        } else if (o instanceof Map) {
-            Map<String, ConfigurationNode> nodes =
-                new HashMap<String, ConfigurationNode>();
-            
-            for (Map.Entry<String, Object> entry : ((Map<String, Object>)o).entrySet()) {
-                if (entry.getValue() instanceof Map) {
-                    nodes.put(entry.getKey(),
-                            new ConfigurationNode((Map<String, Object>) entry.getValue()));
-                }
-            }
-            
-            return nodes;
-        } else {
-            return null;
-        }
-    }
-    
-    /**
-     * Casts a value to an integer. May return null.
-     * 
-     * @param o
-     * @return
-     */
-    private static Integer castInt(Object o) {
-        if (o == null) {
-            return null;
-        } else if (o instanceof Byte) {
-            return (int)(Byte)o;
-        } else if (o instanceof Integer) {
-            return (Integer)o;
-        } else if (o instanceof Double) {
-            return (int)(double)(Double)o;
-        } else if (o instanceof Float) {
-            return (int)(float)(Float)o;
-        } else if (o instanceof Long) {
-            return (int)(long)(Long)o;
-        } else {
-            return null;
-        }
-    }
-    
-    /**
-     * Casts a value to a double. May return null.
-     * 
-     * @param o
-     * @return
-     */
-    private static Double castDouble(Object o) {
-        if (o == null) {
-            return null;
-        } else if (o instanceof Float) {
-            return (double)(Float)o;
-        } else if (o instanceof Double) {
-            return (Double)o;
-        } else if (o instanceof Byte) {
-            return (double)(Byte)o;
-        } else if (o instanceof Integer) {
-            return (double)(Integer)o;
-        } else if (o instanceof Long) {
-            return (double)(Long)o;
-        } else {
-            return null;
-        }
-    }
-    
-    /**
-     * Casts a value to a boolean. May return null.
-     * 
-     * @param o
-     * @return
-     */
-    private static Boolean castBoolean(Object o) {
-        if (o == null) {
-            return null;
-        } else if (o instanceof Boolean) {
-            return (Boolean)o;
-        } else {
-            return null;
-        }
-    }
-    
-    /**
-     * Remove the property at a location. This will override existing
-     * configuration data to have it conform to key/value mappings.
-     * 
-     * @param path
-     */
-    @SuppressWarnings("unchecked")
-    public void removeProperty(String path) {
-        if (!path.contains(".")) {
-            root.remove(path);
-            return;
-        }
-        
-        String[] parts = path.split("\\.");
-        Map<String, Object> node = root;
-        
-        for (int i = 0; i < parts.length; i++) {
-            Object o = node.get(parts[i]);
-            
-            // Found our target!
-            if (i == parts.length - 1) {
-                node.remove(parts[i]);
-                return;
-            }
-            
-            node = (Map<String, Object>)o;
-        }
-    }
-}

src/main/assembly/default.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <files>
+    <file>
+      <source>${project.build.directory}/${artifactId}-${project.version}.jar</source>
+      <destName>WorldGuard.jar</destName>
+      <outputDirectory>/</outputDirectory>
+      <filtered>false</filtered>
+    </file>
+    <file>
+      <source>README.html</source>
+      <outputDirectory>/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+  </files>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
+        <include>CHANGELOG.txt</include>
+        <include>contrib/blacklist_table.sql</include>
+        <include>contrib/region_storage.sql</include>
+        <include>contrib/region_storage_update_20110325.sql</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>

src/main/java/com/sk89q/worldguard/LocalPlayer.java

@@ -25,68 +25,66 @@ public abstract class LocalPlayer {
     /**
      * Get a player's name.
      * 
-     * @return
+     * @return The player's name
      */
     public abstract String getName();
     
     /**
      * Returns true if the player is inside a group.
      * 
-     * @param group
-     * @return
+     * @param group The group to check
+     * @return Whether this player is in {@code group}
      */
     public abstract boolean hasGroup(String group);
     
     /**
      * Get the player's position.
      * 
-     * @return
+     * @return The player's position
      */
     public abstract Vector getPosition();
     
     /**
      * Kick the player.
      * 
-     * @param msg
+     * @param msg The message to kick the player with
      */
     public abstract void kick(String msg);
     
     /**
      * Ban the player.
      * 
-     * @param msg
+     * @param msg The message to ban the player with
      */
     public abstract void ban(String msg);
     
     /**
      * Send the player a message;
      * 
-     * @param msg
+     * @param msg The message to send to the player
      */
     public abstract void printRaw(String msg);
     
     /**
      * Get the player's list of groups.
      * 
-     * @return
+     * @return The groups this player is in
      */
     public abstract String[] getGroups();
     
     /**
      * Returns whether a player has permission.
      * 
-     * @param perm 
-     * @return 
+     * @param perm The permission to check
+     * @return Whether this player has {@code perm}
      */
     public abstract boolean hasPermission(String perm);
     
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof LocalPlayer)) {
-            return false;
-        }
-        
-        return ((LocalPlayer)obj).getName().equals(getName());
+
+        return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName());
+
     }
     
     @Override

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

@@ -19,14 +19,19 @@
 
 package com.sk89q.worldguard.blacklist;
 
-import java.util.Map;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
-import java.util.logging.Logger;
+import java.util.Map;
 import java.util.logging.Level;
-import java.io.*;
+import java.util.logging.Logger;
+
 import org.bukkit.ChatColor;
+
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
@@ -36,11 +41,7 @@ import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
  * @author sk89q
  */
 public abstract class Blacklist {
-    /**
-     * Logger.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
+
     /**
      * List of entries by block ID.
      */
@@ -60,18 +61,19 @@ public abstract class Blacklist {
     Map<String,BlacklistTrackedEvent> lastAffected =
             new HashMap<String,BlacklistTrackedEvent>();
 
-
     private boolean useAsWhitelist;
 
-    public Blacklist(Boolean useAsWhitelist)
-    {
+    private final Logger logger;
+
+    public Blacklist(Boolean useAsWhitelist, Logger logger) {
         this.useAsWhitelist = useAsWhitelist;
+        this.logger = logger;
     }
 
     /**
      * Returns whether the list is empty.
-     * 
-     * @return
+     *
+     * @return whether the blacklist is empty
      */
     public boolean isEmpty() {
         return blacklist.isEmpty();
@@ -79,36 +81,36 @@ public abstract class Blacklist {
 
     /**
      * Get the entries for an item or list.
-     * 
-     * @param id 
-     * @return 
+     *
+     * @param id The item id to get blacklist information for
+     * @return The blacklist entries for {@code id}
      */
     public List<BlacklistEntry> getEntries(int id) {
         return blacklist.get(id);
     }
-    
+
     /**
      * Get the number of individual items that have blacklist entries.
-     * 
-     * @return
+     *
+     * @return The number of items in the blacklist
      */
     public int getItemCount() {
         return blacklist.size();
     }
-    
+
     /**
      * Returns whether the blacklist is used as a whitelist.
-     * 
-     * @return
+     *
+     * @return whether the blacklist is be used as a whitelist
      */
     public boolean isWhitelist() {
         return useAsWhitelist;
     }
-    
+
     /**
      * Get the logger.
-     * 
-     * @return
+     *
+     * @return The logger used in this blacklist
      */
     public BlacklistLogger getLogger() {
         return blacklistLogger;
@@ -116,11 +118,11 @@ public abstract class Blacklist {
 
     /**
      * Method to handle the event.
-     * 
-     * @param event
-     * @param forceRepeat
-     * @param silent
-     * @return
+     *
+     * @param event The event to check
+     * @param forceRepeat Whether to force quickly repeating notifications
+     * @param silent Whether to force-deny notifications
+     * @return Whether the event is allowed
      */
     public boolean check(BlacklistEvent event, boolean forceRepeat, boolean silent) {
         List<BlacklistEntry> entries = getEntries(event.getType());
@@ -139,8 +141,8 @@ public abstract class Blacklist {
     /**
      * Load the blacklist.
      *
-     * @param file
-     * @throws IOException
+     * @param file The file to load from
+     * @throws IOException if an error occurred reading from the file
      */
     public void load(File file) throws IOException {
         FileReader input = null;
@@ -168,14 +170,14 @@ public abstract class Blacklist {
                     currentEntries = new ArrayList<BlacklistEntry>();
 
                     for (String item : items) {
-                        int id = 0;
+                        int id;
 
                         try {
                             id = Integer.parseInt(item.trim());
                         } catch (NumberFormatException e) {
                             id = getItemID(item.trim());
                             if (id == 0) {
-                                logger.log(Level.WARNING, "WorldGuard: Unknown block name: "
+                                logger.log(Level.WARNING, "Unknown block name: "
                                         + item);
                                 break;
                             }
@@ -205,6 +207,8 @@ public abstract class Blacklist {
                     for (BlacklistEntry entry : currentEntries) {
                         if (parts[0].equalsIgnoreCase("ignore-groups")) {
                             entry.setIgnoreGroups(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("ignore-perms")) {
+                            entry.setIgnorePermissions(parts[1].split(","));
                         } else if (parts[0].equalsIgnoreCase("on-break")) {
                             entry.setBreakActions(parts[1].split(","));
                         } else if (parts[0].equalsIgnoreCase("on-destroy-with")) {
@@ -244,48 +248,48 @@ public abstract class Blacklist {
                 if (input != null) {
                     input.close();
                 }
-            } catch (IOException e2) {
+            } catch (IOException ignore) {
             }
         }
     }
-    
+
     /**
      * Get the last event.
-     * 
-     * @return
+     *
+     * @return The last event
      */
     public BlacklistEvent getLastEvent() {
         return lastEvent;
     }
-    
+
     /**
      * Notify administrators.
-     * 
-     * @param event
-     * @param comment 
+     *
+     * @param event The event to notify about
+     * @param comment The comment to notify with
      */
     public void notify(BlacklistEvent event, String comment) {
         lastEvent = event;
-        
-        broadcastNotification(ChatColor.GRAY + "WG: " 
+
+        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
+     *
+     * @param msg The message to broadcast
      */
     public abstract void broadcastNotification(String msg);
 
     /**
      * Forget a player.
      *
-     * @param player
+     * @param player The player to forget
      */
     public void forgetPlayer(LocalPlayer player) {
         lastAffected.remove(player.getName());
@@ -300,8 +304,9 @@ public abstract class Blacklist {
 
     /**
      * Get an item's ID from its name.
-     * 
-     * @param name
+     *
+     * @param name the name of the item to look up
+     * @return the id for name if contained in ItemId, else -1
      */
     private static int getItemID(String name) {
         ItemType type = ItemType.lookup(name);
@@ -314,8 +319,9 @@ public abstract class Blacklist {
 
     /**
      * Get an item's friendly name with its ID.
-     * 
-     * @param id
+     *
+     * @param id The id to look up
+     * @return The item's friendly name
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);

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

@@ -19,9 +19,12 @@
 
 package com.sk89q.worldguard.blacklist;
 
-import java.util.Set;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.Set;
+
 import org.bukkit.ChatColor;
+
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
@@ -42,11 +45,17 @@ public class BlacklistEntry {
      * Parent blacklist entry.
      */
     private Blacklist blacklist;
+
     /**
      * List of groups to not affect.
      */
     private Set<String> ignoreGroups;
-    
+
+    /**
+     * List of permissions to not affect.
+     */
+    private Set<String> ignorePermissions;
+
     private String[] breakActions;
     private String[] destroyWithActions;
     private String[] placeActions;
@@ -54,14 +63,14 @@ public class BlacklistEntry {
     private String[] useActions;
     private String[] dropActions;
     private String[] acquireActions;
-    
+
     private String message;
     private String comment;
 
     /**
      * Construct the object.
-     * 
-     * @param blacklist
+     *
+     * @param blacklist The blacklist that contains this entry
      */
     public BlacklistEntry(Blacklist blacklist) {
         this.blacklist = blacklist;
@@ -74,6 +83,13 @@ public class BlacklistEntry {
         return ignoreGroups.toArray(new String[ignoreGroups.size()]);
     }
 
+    /**
+     * @return the ignoreGroups
+     */
+    public String[] getIgnorePermissions() {
+        return ignorePermissions.toArray(new String[ignorePermissions.size()]);
+    }
+
     /**
      * @param ignoreGroups the ignoreGroups to set
      */
@@ -86,98 +102,107 @@ public class BlacklistEntry {
     }
 
     /**
-     * @return
+     * @param ignorePermissions the ignorePermissions to set
+     */
+    public void setIgnorePermissions(String[] ignorePermissions) {
+        Set<String> ignorePermissionsSet = new HashSet<String>();
+        Collections.addAll(ignorePermissionsSet, ignorePermissions);
+        this.ignorePermissions = ignorePermissionsSet;
+    }
+
+    /**
+     * @return The actions that occur when breaking
      */
     public String[] getBreakActions() {
         return breakActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when breaking
      */
     public void setBreakActions(String[] actions) {
         this.breakActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that occur when destroying with a specific item
      */
     public String[] getDestroyWithActions() {
         return destroyWithActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when destroying with an item
      */
     public void setDestroyWithActions(String[] actions) {
         this.destroyWithActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when placing
      */
     public String[] getPlaceActions() {
         return placeActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when placing
      */
     public void setPlaceActions(String[] actions) {
         this.placeActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when interacting
      */
     public String[] getInteractActions() {
         return interactActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when interacting
      */
     public void setInteractActions(String[] actions) {
         this.interactActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when using
      */
     public String[] getUseActions() {
         return useActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when using
      */
     public void setUseActions(String[] actions) {
         this.useActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when dropping
      */
     public String[] getDropActions() {
         return dropActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when dropping
      */
     public void setDropActions(String[] actions) {
         this.dropActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when acquiring
      */
     public String[] getAcquireActions() {
         return acquireActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when acquiring
      */
     public void setAcquireActions(String[] actions) {
         this.acquireActions = actions;
@@ -214,50 +239,57 @@ public class BlacklistEntry {
     /**
      * Returns true if this player should be ignored.
      *
-     * @param player
-     * @return
+     * @param player The player to check
+     * @return whether this player should be ignored for blacklist blocking
      */
     public boolean shouldIgnore(LocalPlayer player) {
-        if (ignoreGroups == null) {
-            return false;
+        if (ignoreGroups != null) {
+            for (String group : player.getGroups()) {
+                if (ignoreGroups.contains(group.toLowerCase())) {
+                    return true;
+                }
+            }
         }
-        for (String group : player.getGroups()) {
-            if (ignoreGroups.contains(group.toLowerCase())) {
-                return true;
+
+        if (ignorePermissions != null) {
+            for (String perm : ignorePermissions) {
+                if (player.hasPermission(perm)) {
+                    return true;
+                }
             }
         }
 
         return false;
     }
-    
+
     /**
      * Get the associated actions with an event.
-     * 
-     * @param event
-     * @return
+     *
+     * @param event The event to check
+     * @return The actions for the given event
      */
     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;
         }
@@ -265,16 +297,16 @@ public class BlacklistEntry {
 
     /**
      * Method to handle the event.
-     * 
-     * @param useAsWhitelist 
-     * @param event
-     * @param forceRepeat
-     * @param silent
-     * @return
+     *
+     * @param useAsWhitelist Whether this entry is buing used in a whitelist
+     * @param event The event to check
+     * @param forceRepeat Whether to force repeating notifications even within the delay limit
+     * @param silent Whether to prevent notifications from happening
+     * @return Whether the action was allowed
      */
     public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean forceRepeat, boolean silent) {
         LocalPlayer player = event.getPlayer();
-        
+
         if (shouldIgnore(player)) {
             return true;
         }
@@ -295,21 +327,21 @@ public class BlacklistEntry {
 
         String actions[] = getActions(event);
 
-        
-        boolean ret = useAsWhitelist ? false : true;
-        
+
+        boolean ret = !useAsWhitelist;
+
         // Nothing to do
         if (actions == null) {
-            return useAsWhitelist ? false : true;
+            return ret;
         }
-        
+
         for (String action : actions) {
             // Deny
             if (action.equalsIgnoreCase("deny")) {
                 if (silent) {
                     return false;
                 }
-                
+
                 ret = false;
 
             // Allow
@@ -325,7 +357,7 @@ public class BlacklistEntry {
                 if (silent) {
                     continue;
                 }
-                
+
                 if (this.message != null) {
                     player.kick(String.format(this.message,
                             getFriendlyItemName(event.getType())));
@@ -339,7 +371,7 @@ public class BlacklistEntry {
                 if (silent) {
                     continue;
                 }
-                
+
                 if (this.message != null) {
                     player.ban("Banned: " + String.format(this.message,
                             getFriendlyItemName(event.getType())));
@@ -348,12 +380,12 @@ public class BlacklistEntry {
                             + 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);
@@ -378,8 +410,8 @@ public class BlacklistEntry {
 
     /**
      * Get an item's friendly name with its ID.
-     * 
-     * @param id
+     *
+     * @param id The id to get a name for
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);

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

@@ -19,8 +19,9 @@
 
 package com.sk89q.worldguard.blacklist;
 
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
+
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 import com.sk89q.worldguard.blacklist.loggers.BlacklistLoggerHandler;
 
@@ -38,16 +39,16 @@ public class BlacklistLogger implements BlacklistLoggerHandler {
     /**
      * Add a handler.
      *
-     * @param handler
+     * @param handler The handler to add
      */
     public void addHandler(BlacklistLoggerHandler handler) {
         handlers.add(handler);
     }
 
     /**
-     * Add a handler.
+     * Remove a handler.
      *
-     * @param handler
+     * @param handler The handler to remove
      */
     public void removeHandler(BlacklistLoggerHandler handler) {
         handlers.remove(handler);
@@ -59,11 +60,11 @@ public class BlacklistLogger implements BlacklistLoggerHandler {
     public void clearHandlers() {
         handlers.clear();
     }
-    
+
     /**
      * Log an event.
      *
-     * @param event
+     * @param event The event to log
      */
     public void logEvent(BlacklistEvent event, String comment) {
         for (BlacklistLoggerHandler handler : handlers) {

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

@@ -31,9 +31,9 @@ public class BlacklistTrackedEvent {
 
     /**
      * Construct the object.
-     * 
-     * @param event 
-     * @param time
+     *
+     * @param event The event tracked
+     * @param time The time at which the event occurred
      */
     public BlacklistTrackedEvent(BlacklistEvent event, long time) {
         this.event = event;

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

@@ -39,9 +39,9 @@ public abstract class BlacklistEvent {
     /**
      * Construct the object.
      * 
-     * @param player
-     * @param pos
-     * @param type
+     * @param player The player associated with this event
+     * @param pos The position the event occurred at
+     * @param type The type of item used
      */
     public BlacklistEvent(LocalPlayer player, Vector pos, int type) {
         this.player = player;
@@ -51,8 +51,8 @@ public abstract class BlacklistEvent {
     
     /**
      * Get the player.
-     * 
-     * @return
+     *
+     * @return The player associated with this event
      */
     public LocalPlayer getPlayer() {
         return player;
@@ -61,16 +61,16 @@ public abstract class BlacklistEvent {
     /**
      * Get the position.
      * 
-     * @return
+     * @return The position of this event
      */
     public Vector getPosition() {
         return pos;
     }
     
     /**
-     * Get the type.
+     * Get the item type.
      * 
-     * @return
+     * @return The type associated with this event
      */
     public int getType() {
         return type;
@@ -79,7 +79,7 @@ public abstract class BlacklistEvent {
     /**
      * Get a short description such as "break" or "destroy with."
      * 
-     * @return
+     * @return The event description
      */
     public abstract String getDescription();
 }

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

@@ -26,12 +26,7 @@ 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
-     */
+
     @Override
     public String getDescription() {
         return "break";

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

@@ -26,12 +26,7 @@ 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
-     */
+
     @Override
     public String getDescription() {
         return "interact with";

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

@@ -26,12 +26,7 @@ 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
-     */
+
     @Override
     public String getDescription() {
         return "place";

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

@@ -26,12 +26,7 @@ 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
-     */
+
     @Override
     public String getDescription() {
         return "destroy with";

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

@@ -26,12 +26,7 @@ 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
-     */
+
     @Override
     public String getDescription() {
         return "acquire";

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

@@ -26,12 +26,7 @@ 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
-     */
+
     @Override
     public String getDescription() {
         return "drop";

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

@@ -26,12 +26,7 @@ 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
-     */
+
     @Override
     public String getDescription() {
         return "use";

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

@@ -34,7 +34,7 @@ public interface BlacklistLoggerHandler {
      * @param comment
      */
     public void logEvent(BlacklistEvent event, String comment);
-    
+
     /**
      * Close the logger.
      */

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

@@ -19,102 +19,104 @@
 
 package com.sk89q.worldguard.blacklist.loggers;
 
-import java.util.logging.Logger;
 import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldguard.blacklist.events.*;
+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 ConsoleLoggerHandler implements BlacklistLoggerHandler {
-    /**
-     * Logger.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
-    
+
+
     private String worldName;
-    
-    public ConsoleLoggerHandler(String worldName)
-    {
-       this.worldName = worldName;    
+	
+    private final Logger logger;
+
+    public ConsoleLoggerHandler(String worldName, Logger logger) {
+        this.worldName = worldName;
+	    this.logger = logger;
     }
 
-    /**
-     * Log an event.
-     *
-     * @param event
-     */
     public void logEvent(BlacklistEvent event, String comment) {
         // Block break
         if (event instanceof BlockBreakBlacklistEvent) {
             BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
-            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "[" + worldName + "] " + 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: [" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
                     + " tried to place " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));
-        
+
         // Block interact
         } else if (event instanceof BlockInteractBlacklistEvent) {
             BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
-            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "[" + worldName + "] " + 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: [" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "[" + worldName + "] " + 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: [" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "[" + worldName + "] " + 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: [" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "[" + worldName + "] " + 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: [" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
                     + " tried to use " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));
-        
+
         // Unknown
         } else {
-            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
                     + " caught unknown event: " + event.getClass().getCanonicalName());
         }
     }
 
     /**
      * Get an item's friendly name with its ID.
-     * 
-     * @param id
+     *
+     * @param id The item id
+     * @return The friendly name of the item
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);
         if (type != null) {
             return type.getName() + " (#" + id + ")";
         } else {
-            return "#" + id + "";
+            return "#" + id;
         }
     }
 

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

@@ -19,17 +19,19 @@
 
 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 java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 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.BlockInteractBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
@@ -40,58 +42,58 @@ 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;
+    private final String dsn;
     /**
      * Username.
      */
-    private String user;
+    private final String user;
     /**
      * Password.
      */
-    private String pass;
+    private final String pass;
     /**
      * Table.
      */
-    private String table;
+    private final String table;
     /**
      * World name.
      */
-    private String worldName;
+    private final String worldName;
     /**
      * Database connection.
      */
     private Connection conn;
+    
+    private final Logger logger;
 
     /**
      * Construct the object.
-     * 
-     * @param dsn
-     * @param user
-     * @param pass
-     * @param table 
-     * @param worldName 
+     *
+     * @param dsn The DSN for the connection
+     * @param user The username to connect with
+     * @param pass The password to connect with
+     * @param table The table to log to
+     * @param worldName The name of the world to log
+     * @param logger The logger to log errors to
      */
-    public DatabaseLoggerHandler(String dsn, String user, String pass, String table, String worldName) {
+    public DatabaseLoggerHandler(String dsn, String user, String pass, String table, String worldName, Logger logger) {
         this.dsn = dsn;
         this.user = user;
         this.pass = pass;
         this.table = table;
         this.worldName = worldName;
+        this.logger = logger;
     }
 
     /**
      * Gets the database connection.
-     * 
-     * @return
-     * @throws SQLException
+     *
+     * @return The database connection
+     * @throws SQLException when the connection cannot be created
      */
     private Connection getConnection() throws SQLException {
         if (conn == null || conn.isClosed()) {
@@ -102,14 +104,12 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
 
     /**
      * Log an event to the database.
-     * 
-     * @param event
-     * @param name
-     * @param x
-     * @param y
-     * @param z
-     * @param item
-     * @param comment
+     *
+     * @param event The event to log
+     * @param player The player associated with the event
+     * @param pos The location of the event
+     * @param item The item used
+     * @param comment The comment associated with the event
      */
     private void logEvent(String event, LocalPlayer player, Vector pos, int item,
             String comment) {
@@ -134,11 +134,11 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
                     + e.getMessage());
         }
     }
-    
+
     /**
      * Log an event.
      *
-     * @param event
+     * @param event The event to log
      */
     public void logEvent(BlacklistEvent event, String comment) {
         // Block break
@@ -146,43 +146,43 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
             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;
+        } else if (event instanceof BlockInteractBlacklistEvent) {
+            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)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) {
             ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
             logEvent("USE", evt.getPlayer(), evt.getPlayer().getPosition(),
                     evt.getType(), comment);
-        
+
         // Unknown
         } else {
             logEvent("UNKNOWN", event.getPlayer(), event.getPlayer().getPosition(),
@@ -198,8 +198,8 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
             if (conn != null && !conn.isClosed()) {
                 conn.close();
             }
-        } catch (SQLException e) {
-            
+        } catch (SQLException ignore) {
+
         }
     }
 }

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

@@ -19,26 +19,32 @@
 
 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.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.*;
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 
 /**
  *
  * @author sk89q
  */
 public class FileLoggerHandler implements BlacklistLoggerHandler {
-    /**
-     * Logger.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
     /**
      * Regex for patterns in the path.
      */
@@ -66,38 +72,45 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
      */
     private TreeMap<String,FileLoggerWriter> writers =
             new TreeMap<String,FileLoggerWriter>();
+    
+    private final Logger logger;
 
     /**
      * Construct the object.
      *
-     * @param pathPattern
-     * @param worldName 
+     * @param pathPattern The pattern for the logflie path
+     * @param worldName The name of the world
+     * @param logger The logger used to log errors
      */
-    public FileLoggerHandler(String pathPattern, String worldName) {
+    public FileLoggerHandler(String pathPattern, String worldName, Logger logger) {
         this.pathPattern = pathPattern;
         this.worldName = worldName;
+        this.logger = logger;
     }
 
     /**
      * Construct the object.
      *
-     * @param pathPattern
-     * @param cacheSize
-     * @param worldName 
+     * @param pathPattern The pattern for logfile paths
+     * @param cacheSize The size of the file cache
+     * @param worldName The name of the associated world
+     * @param logger The logger to log errors with
      */
-    public FileLoggerHandler(String pathPattern, int cacheSize, String worldName) {
+    public FileLoggerHandler(String pathPattern, int cacheSize, String worldName, Logger logger) {
         if (cacheSize < 1) {
             throw new IllegalArgumentException("Cache size cannot be less than 1");
         }
         this.pathPattern = pathPattern;
         this.cacheSize = cacheSize;
         this.worldName = worldName;
+        this.logger = logger;
     }
 
     /**
      * Build the path.
-     * 
-     * @return
+     *
+     * @param playerName The name of the playername
+     * @return The path for the logfile
      */
     private String buildPath(String playerName) {
         GregorianCalendar calendar = new GregorianCalendar();
@@ -142,20 +155,21 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
             } else if (group.matches("%s")) {
                 rep = String.format("%02d", calendar.get(Calendar.SECOND));
             }
-            
+
             m.appendReplacement(buffer, rep);
         }
 
         m.appendTail(buffer);
-        
+
         return buffer.toString();
     }
 
     /**
      * Log a message.
-     * 
-     * @param player
-     * @param message
+     *
+     * @param player The player to log
+     * @param message The message to log
+     * @param comment The comment associated with the logged event
      */
     private void log(LocalPlayer player, String message, String comment) {
         String path = buildPath(player.getName());
@@ -163,7 +177,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
             String date = dateFormat.format(new Date());
             String line = "[" + date + "] " + player.getName() + ": " + message
                     + (comment != null ? " (" + comment + ")" : "") + "\r\n";
-            
+
             FileLoggerWriter writer = writers.get(path);
 
             // Writer already exists!
@@ -185,7 +199,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
             if (parent != null && !parent.exists()) {
                 parent.mkdirs();
             }
-            
+
             FileWriter stream = new FileWriter(path, true);
             BufferedWriter out = new BufferedWriter(stream);
             out.write(line);
@@ -203,7 +217,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
                     Map.Entry<String,FileLoggerWriter> entry = it.next();
                     try {
                         entry.getValue().getWriter().close();
-                    } catch (IOException e) {
+                    } catch (IOException ignore) {
                     }
                     it.remove();
 
@@ -222,71 +236,33 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
 
     /**
      * Gets the coordinates in text form for the log.
-     * 
-     * @param pos
-     * @return
+     *
+     * @param pos The position to get coordinates for
+     * @return The position's coordinates in human-readable form
      */
     private String getCoordinates(Vector pos) {
         return "@" + pos.getBlockX() + "," + pos.getBlockY() + "," + pos.getBlockZ();
     }
-    
+
     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 event.
      *
-     * @param event
+     * @param event The event to log
      */
     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) {
-            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
-            logEvent(event, "drop", evt.getType(), evt.getPosition(), comment);
-            
-        // Use
-        } else if (event instanceof ItemUseBlacklistEvent) {
-            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
-            logEvent(event, "use", evt.getType(), evt.getPosition(), comment);
-        
-        // Unknown
-        } else {
-            log(event.getPlayer(), "Unknown event: "
-                    + event.getClass().getCanonicalName(), comment);
-        }
+        logEvent(event, event.getDescription(), event.getType(), event.getPosition(), comment);
     }
 
     /**
      * Get an item's friendly name with its ID.
      *
-     * @param id
+     * @param id The id to get a friendly name for
+     * @return The friendly name
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);
@@ -304,7 +280,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
         for (Map.Entry<String,FileLoggerWriter> entry : writers.entrySet()) {
             try {
                 entry.getValue().getWriter().close();
-            } catch (IOException e) {
+            } catch (IOException ignore) {
             }
         }
 

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

@@ -19,7 +19,7 @@
 
 package com.sk89q.worldguard.blacklist.loggers;
 
-import java.io.*;
+import java.io.BufferedWriter;
 
 /**
  *
@@ -41,9 +41,9 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {
 
     /**
      * Construct the object.
-     * 
-     * @param path 
-     * @param writer
+     *
+     * @param path The path to write to
+     * @param writer The writer for the file
      */
     public FileLoggerWriter(String path, BufferedWriter writer) {
         this.path = path;
@@ -53,15 +53,15 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {
 
     /**
      * File path.
-     * 
-     * @return
+     *
+     * @return The path the logger is logging to
      */
     public String getPath() {
         return path;
     }
 
     /**
-     * @return the writer
+     * @return the writer being logged to
      */
     public BufferedWriter getWriter() {
         return writer;
@@ -73,7 +73,7 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {
     public long getLastUse() {
         return lastUse;
     }
-    
+
     /**
      * Update last use time.
      */
@@ -81,12 +81,6 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {
         lastUse = System.currentTimeMillis();
     }
 
-    /**
-     * Comparison function.
-     * 
-     * @param other
-     * @return
-     */
     public int compareTo(FileLoggerWriter other) {
         if (lastUse > other.lastUse) {
             return 1;

src/main/java/com/sk89q/worldguard/bukkit/AbstractPermissionModel.java

@@ -0,0 +1,46 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.command.CommandSender;
+import org.enginehub.util.PermissionModel;
+
+abstract class AbstractPermissionModel implements PermissionModel {
+    
+    private final WorldGuardPlugin plugin;
+    private final CommandSender sender;
+
+    public AbstractPermissionModel(WorldGuardPlugin plugin, CommandSender sender) {
+        this.plugin = plugin;
+        this.sender = sender;
+    }
+    
+    protected WorldGuardPlugin getPlugin() {
+        return plugin;
+    }
+
+    public CommandSender getSender() {
+        return sender;
+    }
+
+    protected boolean hasPluginPermission(String permission) {
+        return plugin.hasPermission(getSender(), "worldguard." + permission);
+    }
+
+}

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

@@ -19,24 +19,18 @@
 
 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(Boolean useAsWhitelist, WorldGuardPlugin plugin) {
-        super(useAsWhitelist);
+        super(useAsWhitelist, plugin.getLogger());
         this.plugin = plugin;
     }
     
     @Override
     public void broadcastNotification(String msg) {
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            if (plugin.hasPermission(player, "worldguard.notify")) {
-                player.sendMessage(msg);
-            }
-        }
+        plugin.broadcastNotification(msg);
     }
-
 }

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

@@ -21,6 +21,7 @@ package com.sk89q.worldguard.bukkit;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 
@@ -56,6 +57,7 @@ public class BukkitPlayer extends LocalPlayer {
 
     @Override
     public void ban(String msg) {
+        player.setBanned(true);
         player.kickPlayer(msg);
     }
 
@@ -73,5 +75,4 @@ public class BukkitPlayer extends LocalPlayer {
     public boolean hasPermission(String perm) {
         return plugin.hasPermission(player, perm);
     }
-
 }

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

@@ -0,0 +1,296 @@
+// $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 com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.blocks.BlockType;
+import com.sk89q.worldedit.blocks.ItemID;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.*;
+import org.bukkit.inventory.ItemStack;
+import java.util.List;
+
+public class BukkitUtil {
+
+    private BukkitUtil()  {
+
+    }
+
+    /**
+     * Converts the location of a Bukkit block to a WorldEdit vector.
+     *
+     * @param block The block to convert
+     * @return The block's location as a BlockVector
+     */
+    public static BlockVector toVector(Block block) {
+        return new BlockVector(block.getX(), block.getY(), block.getZ());
+    }
+
+    /**
+     * Converts a Bukkit location to a WorldEdit vector.
+     *
+     * @param loc A Bukkit Location
+     * @return A Vector with the location's x, y, and z values
+     */
+    public static Vector toVector(Location loc) {
+        return new Vector(loc.getX(), loc.getY(), loc.getZ());
+    }
+
+    /**
+     * Converts a Bukkit vector to a WorldEdit vector.
+     *
+     * @param vector The Bukkit vector
+     * @return A WorldEdit vector with the same values as the Bukkit vector.
+     */
+    public static Vector toVector(org.bukkit.util.Vector vector) {
+        return new Vector(vector.getX(), vector.getY(), vector.getZ());
+    }
+
+    /**
+     * Converts a WorldEdit vector to a Bukkit location.
+     *
+     * @param world The World to create the new Location with
+     * @param vec The vector to use for coordinates
+     * @return The Vector as a location with a World of world
+     */
+    public static Location toLocation(World world, Vector vec) {
+        return new Location(world, vec.getX(), vec.getY(), vec.getZ());
+    }
+
+    /**
+     * Matches one player based on name.
+     *
+     * @param server The server to check
+     * @param name The name to attempt to match
+     * @deprecated see {@link WorldGuardPlugin#matchSinglePlayer(org.bukkit.command.CommandSender, String)}
+     * @return The matched player if any, otherwise null
+     */
+    @Deprecated
+    public static Player matchSinglePlayer(Server server, String name) {
+        List<Player> players = server.matchPlayer(name);
+        if (players.size() == 0) {
+            return null;
+        }
+        return players.get(0);
+    }
+
+    /**
+     * Drops a sign item and removes a sign.
+     *
+     * @param block The block
+     * @deprecated see {@link org.bukkit.block.Block#breakNaturally()}
+     */
+    @Deprecated
+    public static void dropSign(Block block) {
+        block.setTypeId(0);
+        block.getWorld().dropItemNaturally(block.getLocation(),
+                new ItemStack(ItemID.SIGN, 1));
+    }
+
+    /**
+     * Sets the given block to fluid water.
+     * Used by addSpongeWater()
+     *
+     * @param world
+     * @param ox
+     * @param oy
+     * @param oz
+     */
+    public static void setBlockToWater(World world, int ox, int oy, int oz) {
+        Block block = world.getBlockAt(ox, oy, oz);
+        int id = block.getTypeId();
+        if (id == 0) {
+            block.setTypeId(8);
+        }
+    }
+
+    /**
+     * Checks if the given block is water
+     *
+     * @param world the world
+     * @param ox x
+     * @param oy y
+     * @param oz z
+     * @return true if it's water
+     */
+    public static boolean isBlockWater(World world, int ox, int oy, int oz) {
+        Block block = world.getBlockAt(ox, oy, oz);
+        int id = block.getTypeId();
+        return id == 8 || id == 9;
+    }
+
+    /**
+     * Checks if the given potion is a vial of water.
+     *
+     * @param item the item to check
+     * @return true if it's a water vial
+     */
+    public static boolean isWaterPotion(ItemStack item) {
+        return (item.getDurability() & 0x3F) == 0;
+    }
+
+    /**
+     * Get just the potion effect bits. This is to work around bugs with potion
+     * parsing.
+     *
+     * @param item item
+     * @return new bits
+     */
+    public static int getPotionEffectBits(ItemStack item) {
+        return item.getDurability() & 0x3F;
+    }
+
+    /**
+     * Find a position for the player to stand that is not inside a block.
+     * Blocks above the player will be iteratively tested until there is
+     * a series of two free blocks. The player will be teleported to
+     * that free position.
+     *
+     * @param player
+     */
+    public static void findFreePosition(Player player) {
+        Location loc = player.getLocation();
+        int x = loc.getBlockX();
+        int y = Math.max(0, loc.getBlockY());
+        int origY = y;
+        int z = loc.getBlockZ();
+        World world = player.getWorld();
+
+        byte free = 0;
+
+        while (y <= world.getMaxHeight() + 1) {
+            if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) {
+                free++;
+            } else {
+                free = 0;
+            }
+
+            if (free == 2) {
+                if (y - 1 != origY || y == 1) {
+                    loc.setX(x + 0.5);
+                    loc.setY(y);
+                    loc.setZ(z + 0.5);
+                    if (y <= 2 && world.getBlockAt(x,0,z).getTypeId() == BlockID.AIR) {
+                        world.getBlockAt(x,0,z).setTypeId(20);
+                        loc.setY(2);
+                    }
+                    player.setFallDistance(0F);
+                    player.teleport(loc);
+                }
+                return;
+            }
+
+            y++;
+        }
+    }
+
+    /**
+     * Replace color macros in a string. The macros are in the form of `[char]
+     * where char represents the color. R is for red, Y is for yellow,
+     * G is for green, C is for cyan, B is for blue, and P is for purple.
+     * The uppercase versions of those are the darker shades, while the
+     * lowercase versions are the lighter shades. For white, it's 'w', and
+     * 0-2 are black, dark grey, and grey, respectively.
+     *
+     * @param str
+     * @return color-coded string
+     */
+    public static String replaceColorMacros(String str) {
+        str = str.replace("&r", ChatColor.RED.toString());
+        str = str.replace("&R", ChatColor.DARK_RED.toString());
+
+        str = str.replace("&y", ChatColor.YELLOW.toString());
+        str = str.replace("&Y", ChatColor.GOLD.toString());
+
+        str = str.replace("&g", ChatColor.GREEN.toString());
+        str = str.replace("&G", ChatColor.DARK_GREEN.toString());
+
+        str = str.replace("&c", ChatColor.AQUA.toString());
+        str = str.replace("&C", ChatColor.DARK_AQUA.toString());
+
+        str = str.replace("&b", ChatColor.BLUE.toString());
+        str = str.replace("&B", ChatColor.DARK_BLUE.toString());
+
+        str = str.replace("&p", ChatColor.LIGHT_PURPLE.toString());
+        str = str.replace("&P", ChatColor.DARK_PURPLE.toString());
+
+        str = str.replace("&0", ChatColor.BLACK.toString());
+        str = str.replace("&1", ChatColor.DARK_GRAY.toString());
+        str = str.replace("&2", ChatColor.GRAY.toString());
+        str = str.replace("&w", ChatColor.WHITE.toString());
+
+        return str;
+    }
+
+    /**
+     * Returns whether an entity should be removed for the halt activity mode.
+     *
+     * @param entity
+     * @return true if it's to be removed
+     */
+    public static boolean isIntensiveEntity(Entity entity) {
+        return entity instanceof Item
+                || entity instanceof TNTPrimed
+                || entity instanceof ExperienceOrb
+                || entity instanceof FallingSand
+                || (entity instanceof LivingEntity
+                    && !(entity instanceof Tameable)
+                    && !(entity instanceof Player));
+    }
+
+    /**
+     * Returns whether our running CraftBukkit already supports
+     * the HangingEvent instead of the PaintingEvent
+     *
+     * @return true if the hanging event is supported
+     */
+    public static boolean hasHangingEvent() {
+        Class<?> tmp = null;
+        try {
+            tmp = Class.forName("org.bukkit.event.hanging.HangingEvent");
+        } catch (ClassNotFoundException ignored) { }
+        return (tmp != null);
+    }
+
+    /**
+     * Search an enum for a value, and return the first one found. Return null if the
+     * enum entry is not found.
+     *
+     * @param enumType enum class
+     * @param values values to test
+     * @return a value in the enum or null
+     */
+    public static <T extends Enum<T>> T tryEnum(Class<T> enumType, String ... values) {
+        for (String val : values) {
+            try {
+                return Enum.valueOf(enumType, val);
+            } catch (IllegalArgumentException e) {
+            }
+        }
+
+        return null;
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java

@@ -0,0 +1,312 @@
+// $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 com.sk89q.commandbook.CommandBook;
+import com.sk89q.commandbook.GodComponent;
+import com.sk89q.util.yaml.YAMLFormat;
+import com.sk89q.util.yaml.YAMLProcessor;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.Blacklist;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * Represents the global configuration and also delegates configuration
+ * for individual worlds.
+ *
+ * @author sk89q
+ * @author Michael
+ */
+public class ConfigurationManager {
+
+    private static final String CONFIG_HEADER = "#\r\n" +
+            "# WorldGuard's main configuration file\r\n" +
+            "#\r\n" +
+            "# This is the global configuration file. Anything placed into here will\r\n" +
+            "# be applied to all worlds. However, each world has its own configuration\r\n" +
+            "# file to allow you to replace most settings in here for that world only.\r\n" +
+            "#\r\n" +
+            "# About editing this file:\r\n" +
+            "# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If\r\n" +
+            "#   you use an editor like Notepad++ (recommended for Windows users), you\r\n" +
+            "#   must configure it to \"replace tabs with spaces.\" In Notepad++, this can\r\n" +
+            "#   be changed in Settings > Preferences > Language Menu.\r\n" +
+            "# - Don't get rid of the indents. They are indented so some entries are\r\n" +
+            "#   in categories (like \"enforce-single-session\" is in the \"protection\"\r\n" +
+            "#   category.\r\n" +
+            "# - If you want to check the format of this file before putting it\r\n" +
+            "#   into WorldGuard, paste it into http://yaml-online-parser.appspot.com/\r\n" +
+            "#   and see if it gives \"ERROR:\".\r\n" +
+            "# - Lines starting with # are comments and so they are ignored.\r\n" +
+            "#\r\n";
+
+    /**
+     * Reference to the plugin.
+     */
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Holds configurations for different worlds.
+     */
+    private ConcurrentMap<String, WorldConfiguration> worlds;
+
+    /**
+     * The global configuration for use when loading worlds
+     */
+    private YAMLProcessor config;
+
+    /**
+     * List of people with god mode.
+     */
+    @Deprecated
+    private Set<String> hasGodMode = new HashSet<String>();
+
+    /**
+     * List of people who can breathe underwater.
+     */
+    private Set<String> hasAmphibious = new HashSet<String>();
+
+    private boolean hasCommandBookGodMode = false;
+
+    public boolean useRegionsScheduler;
+    public boolean useRegionsCreatureSpawnEvent;
+    public boolean activityHaltToggle = false;
+    public boolean autoGodMode;
+    public boolean usePlayerMove;
+    public boolean usePlayerTeleports;
+    public boolean deopOnJoin;
+    public boolean blockInGameOp;
+    public Map<String, String> hostKeys = new HashMap<String, String>();
+
+    /**
+     * Region Storage Configuration method, and config values
+     */
+    public boolean useSqlDatabase = false;
+    public String sqlDsn;
+    public String sqlUsername;
+    public String sqlPassword;
+
+    /**
+     * Construct the object.
+     *
+     * @param plugin The plugin instance
+     */
+    public ConfigurationManager(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+        this.worlds = new ConcurrentHashMap<String, WorldConfiguration>();
+    }
+
+    /**
+     * Load the configuration.
+     */
+    @SuppressWarnings("unchecked")
+    public void load() {
+        // Create the default configuration file
+        plugin.createDefaultConfiguration(
+                new File(plugin.getDataFolder(), "config.yml"), "config.yml");
+
+        config = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), true, YAMLFormat.EXTENDED);
+        try {
+            config.load();
+        } catch (IOException e) {
+            plugin.getLogger().severe("Error reading configuration for global config: ");
+            e.printStackTrace();
+        }
+
+        config.removeProperty("suppress-tick-sync-warnings");
+        useRegionsScheduler = config.getBoolean("regions.use-scheduler", true);
+        useRegionsCreatureSpawnEvent = config.getBoolean("regions.use-creature-spawn-event", true);
+        autoGodMode = config.getBoolean("auto-invincible", config.getBoolean("auto-invincible-permission", false));
+        config.removeProperty("auto-invincible-permission");
+        usePlayerMove = config.getBoolean("use-player-move-event", true);
+        usePlayerTeleports = config.getBoolean("use-player-teleports", true);
+
+        deopOnJoin = config.getBoolean("security.deop-everyone-on-join", false);
+        blockInGameOp = config.getBoolean("security.block-in-game-op-command", false);
+
+        hostKeys = new HashMap<String, String>();
+        Object hostKeysRaw = config.getProperty("host-keys");
+        if (hostKeysRaw == null || !(hostKeysRaw instanceof Map)) {
+            config.setProperty("host-keys", new HashMap<String, String>());
+        } else {
+            for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) hostKeysRaw).entrySet()) {
+                String key = String.valueOf(entry.getKey());
+                String value = String.valueOf(entry.getValue());
+                hostKeys.put(key.toLowerCase(), value);
+            }
+        }
+
+        useSqlDatabase = config.getBoolean(
+                "regions.sql.use", false);
+
+        sqlDsn = config.getString("regions.sql.dsn", "jdbc:mysql://localhost/worldguard");
+        sqlUsername = config.getString("regions.sql.username", "worldguard");
+        sqlPassword = config.getString("regions.sql.password", "worldguard");
+
+        // Load configurations for each world
+        for (World world : plugin.getServer().getWorlds()) {
+            get(world);
+        }
+
+        config.setHeader(CONFIG_HEADER);
+
+        if (!config.save()) {
+            plugin.getLogger().severe("Error saving configuration!");
+        }
+    }
+
+    /**
+     * Unload the configuration.
+     */
+    public void unload() {
+        worlds.clear();
+    }
+
+    /**
+     * Get the configuration for a world.
+     *
+     * @param world The world to get the configuration for
+     * @return {@code world}'s configuration
+     */
+    public WorldConfiguration get(World world) {
+        String worldName = world.getName();
+        WorldConfiguration config = worlds.get(worldName);
+        WorldConfiguration newConfig = null;
+
+        while (config == null) {
+            if (newConfig == null) {
+                newConfig = new WorldConfiguration(plugin, worldName, this.config);
+            }
+            worlds.putIfAbsent(world.getName(), newConfig);
+            config = worlds.get(world.getName());
+        }
+
+        return config;
+    }
+
+    /**
+     * Forget a player.
+     *
+     * @param player The player to forget about
+     */
+    public void forgetPlayer(LocalPlayer player) {
+        for (Map.Entry<String, WorldConfiguration> entry
+                : worlds.entrySet()) {
+
+            // The blacklist needs to forget players
+            Blacklist bl = entry.getValue().getBlacklist();
+            if (bl != null) {
+                bl.forgetPlayer(player);
+            }
+        }
+
+        hasGodMode.remove(player.getName());
+        hasAmphibious.remove(player.getName());
+    }
+
+    /**
+     * Enable god mode for a player.
+     *
+     * @param player The player to enable god mode for.
+     */
+    @Deprecated
+    public void enableGodMode(Player player) {
+
+        hasGodMode.add(player.getName());
+    }
+
+    /**
+     * Disable god mode for a player.
+     *
+     * @param player The player to disable godmode for
+     */
+    @Deprecated
+    public void disableGodMode(Player player) {
+        hasGodMode.remove(player.getName());
+    }
+
+    /**
+     * Check to see if god mode is enabled for a player.
+     *
+     * @param player The player to check
+     * @return Whether the player has godmode through WorldGuard or CommandBook
+     */
+    public boolean hasGodMode(Player player) {
+        if (hasCommandBookGodMode) {
+            GodComponent god = CommandBook.inst().getComponentManager().getComponent(GodComponent.class);
+            if (god != null) {
+                return god.hasGodMode(player);
+            }
+        }
+        return hasGodMode.contains(player.getName());
+    }
+
+    /**
+     * Enable amphibious mode for a player.
+     *
+     * @param player The player to enable amphibious mode for
+     */
+    public void enableAmphibiousMode(Player player) {
+        hasAmphibious.add(player.getName());
+    }
+
+    /**
+     * Disable amphibious mode  for a player.
+     *
+     * @param player The player to disable amphibious mode for
+     */
+    public void disableAmphibiousMode(Player player) {
+        hasAmphibious.remove(player.getName());
+    }
+
+    /**
+     * Check to see if amphibious mode is enabled for a player.
+     *
+     * @param player The player to check
+     * @return Whether {@code player} has amphibious mode
+     */
+    public boolean hasAmphibiousMode(Player player) {
+        return hasAmphibious.contains(player.getName());
+    }
+
+    public void updateCommandBookGodMode() {
+        try {
+            if (plugin.getServer().getPluginManager().isPluginEnabled("CommandBook")) {
+                Class.forName("com.sk89q.commandbook.GodComponent");
+                hasCommandBookGodMode = true;
+                return;
+            }
+        } catch (ClassNotFoundException ignore) {}
+        hasCommandBookGodMode = false;
+    }
+
+    public boolean hasCommandBookGodMode() {
+        return hasCommandBookGodMode;
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java

@@ -0,0 +1,251 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bukkit.GameMode;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+/**
+ * This processes per-player state information and is also meant to be used
+ * as a scheduled task.
+ *
+ * @author sk89q
+ */
+public class FlagStateManager implements Runnable {
+
+    public static final int RUN_DELAY = 20;
+
+    private WorldGuardPlugin plugin;
+    private Map<String, PlayerFlagState> states;
+
+    /**
+     * Construct the object.
+     *
+     * @param plugin The plugin instance
+     */
+    public FlagStateManager(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+
+        states = new HashMap<String, PlayerFlagState>();
+    }
+
+    /**
+     * Run the task.
+     */
+    @Override
+	public void run() {
+        Player[] players = plugin.getServer().getOnlinePlayers();
+        ConfigurationManager config = plugin.getGlobalStateManager();
+
+        for (Player player : players) {
+            WorldConfiguration worldConfig = config.get(player.getWorld());
+
+            if (!worldConfig.useRegions) {
+                continue;
+            }
+
+            PlayerFlagState state;
+
+            synchronized (this) {
+                state = states.get(player.getName());
+
+                if (state == null) {
+                    state = new PlayerFlagState();
+                    states.put(player.getName(), state);
+                }
+            }
+
+            Vector playerLocation = toVector(player.getLocation());
+            RegionManager regionManager = plugin.getGlobalRegionManager().get(player.getWorld());
+            ApplicableRegionSet applicable = regionManager.getApplicableRegions(playerLocation);
+
+            if (!RegionQueryUtil.isInvincible(plugin, player, applicable)
+                    && !plugin.getGlobalStateManager().hasGodMode(player)
+                    && !(player.getGameMode() == GameMode.CREATIVE)) {
+                processHeal(applicable, player, state);
+                processFeed(applicable, player, state);
+            }
+        }
+    }
+
+    /**
+     * Process healing for a player.
+     *
+     * @param applicable The set of applicable regions
+     * @param player The player to process healing flags on
+     * @param state The player's state
+     */
+    private void processHeal(ApplicableRegionSet applicable, Player player,
+            PlayerFlagState state) {
+
+        if (player.getHealth() <= 0) {
+            return;
+        }
+
+        long now = System.currentTimeMillis();
+
+        Integer healAmount = applicable.getFlag(DefaultFlag.HEAL_AMOUNT);
+        Integer healDelay = applicable.getFlag(DefaultFlag.HEAL_DELAY);
+        Double minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
+        Double maxHealth = applicable.getFlag(DefaultFlag.MAX_HEAL);
+
+        if (healAmount == null || healDelay == null || healAmount == 0 || healDelay < 0) {
+            return;
+        }
+        if (minHealth == null) {
+			minHealth = 0.0;
+		}
+        if (maxHealth == null) {
+			maxHealth = player.getMaxHealth();
+		}
+
+        // Apply a cap to prevent possible exceptions
+        minHealth = Math.min(player.getMaxHealth(), minHealth);
+        maxHealth = Math.min(player.getMaxHealth(), maxHealth);
+
+        if (player.getHealth() >= maxHealth && healAmount > 0) {
+            return;
+        }
+
+        if (healDelay <= 0) {
+            player.setHealth(healAmount > 0 ? maxHealth : minHealth); // this will insta-kill if the flag is unset
+            state.lastHeal = now;
+        } else if (now - state.lastHeal > healDelay * 1000) {
+            // clamp health between minimum and maximum
+            player.setHealth(Math.min(maxHealth, Math.max(minHealth, player.getHealth() + healAmount)));
+            state.lastHeal = now;
+        }
+    }
+
+    /**
+     * Process restoring hunger for a player.
+     *
+     * @param applicable The set of applicable regions
+     * @param player The player to process hunger flags on
+     * @param state The player's state
+     */
+    private void processFeed(ApplicableRegionSet applicable, Player player,
+            PlayerFlagState state) {
+
+        long now = System.currentTimeMillis();
+
+        Integer feedAmount = applicable.getFlag(DefaultFlag.FEED_AMOUNT);
+        Integer feedDelay = applicable.getFlag(DefaultFlag.FEED_DELAY);
+        Integer minHunger = applicable.getFlag(DefaultFlag.MIN_FOOD);
+        Integer maxHunger = applicable.getFlag(DefaultFlag.MAX_FOOD);
+
+        if (feedAmount == null || feedDelay == null || feedAmount == 0 || feedDelay < 0) {
+            return;
+        }
+        if (minHunger == null) {
+			minHunger = 0;
+		}
+        if (maxHunger == null) {
+			maxHunger = 20;
+		}
+
+        // Apply a cap to prevent possible exceptions
+        minHunger = Math.min(20, minHunger);
+        maxHunger = Math.min(20, maxHunger);
+
+        if (player.getFoodLevel() >= maxHunger && feedAmount > 0) {
+            return;
+        }
+
+        if (feedDelay <= 0) {
+            player.setFoodLevel(feedAmount > 0 ? maxHunger : minHunger);
+            state.lastFeed = now;
+        } else if (now - state.lastFeed > feedDelay * 1000) {
+            // clamp health between minimum and maximum
+            player.setFoodLevel(Math.min(maxHunger, Math.max(minHunger, player.getFoodLevel() + feedAmount)));
+            state.lastFeed = now;
+        }
+    }
+
+    /**
+     * Forget a player.
+     *
+     * @param player The player to forget
+     */
+    public synchronized void forget(Player player) {
+        states.remove(player.getName());
+    }
+
+    /**
+     * Forget all managed players. Use with caution.
+     */
+    public synchronized void forgetAll() {
+        states.clear();
+    }
+
+    /**
+     * Get a player's flag state. A new state will be created if there is no existing
+     * state for the player.
+     *
+     * @param player The player to get a state for
+     * @return The {@code player}'s state
+     */
+    public synchronized PlayerFlagState getState(Player player) {
+        PlayerFlagState state = states.get(player.getName());
+
+        if (state == null) {
+            state = new PlayerFlagState();
+            states.put(player.getName(), state);
+        }
+
+        return state;
+    }
+
+    /**
+     * Keeps state per player.
+     */
+    public static class PlayerFlagState {
+        public long lastHeal;
+        public long lastFeed;
+        public String lastGreeting;
+        public String lastFarewell;
+        public Boolean lastExitAllowed = null;
+        public Boolean notifiedForLeave = false;
+        public Boolean notifiedForEnter = false;
+        public GameMode lastGameMode;
+        public World lastWorld;
+        public int lastBlockX;
+        public int lastBlockY;
+        public int lastBlockZ;
+
+        /* Used to cache invincibility status */
+        public World lastInvincibleWorld;
+        public int lastInvincibleX;
+        public int lastInvincibleY;
+        public int lastInvincibleZ;
+        public boolean wasInvincible;
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java

@@ -19,9 +19,16 @@
 
 package com.sk89q.worldguard.bukkit;
 
-import java.io.*;
-import java.util.logging.Logger;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import org.bukkit.World;
+
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
 import com.sk89q.worldguard.protection.databases.CSVDatabase;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 
@@ -31,15 +38,11 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
  * @author sk89q
  */
 public class LegacyWorldGuardMigration {
-    /**
-     * Logger for messages.
-     */
-    protected static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
     
     /**
      * Port over the blacklist.
      * 
-     * @param plugin
+     * @param plugin The plugin instance
      */
     public static void migrateBlacklist(WorldGuardPlugin plugin) {
         World mainWorld = plugin.getServer().getWorlds().get(0);
@@ -50,7 +53,7 @@ public class LegacyWorldGuardMigration {
         File newFile = new File(plugin.getDataFolder(), newPath);
         
         if (!newFile.exists() && oldFile.exists()) {
-            logger.warning("WorldGuard: WorldGuard will now update your blacklist "
+            plugin.getLogger().warning("WorldGuard will now update your blacklist "
                     + "from an older version of WorldGuard.");
             
             // Need to make root directories
@@ -60,9 +63,9 @@ public class LegacyWorldGuardMigration {
                 oldFile.renameTo(new File(plugin.getDataFolder(),
                         "blacklist.txt.old"));
             } else {
-                logger.warning("WorldGuard: blacklist.txt has been converted " +
+                plugin.getLogger().warning("blacklist.txt has been converted " +
                         "for the main world at " + newPath + "");
-                logger.warning("WorldGuard: Your other worlds currently have no " +
+                plugin.getLogger().warning("Your other worlds currently have no " +
                 		"blacklist defined!");
             }
             
@@ -72,22 +75,22 @@ public class LegacyWorldGuardMigration {
     /**
      * Migrate region settings.
      * 
-     * @param plugin
+     * @param plugin The plugin instance
      */
     public static void migrateRegions(WorldGuardPlugin plugin) {
         try {
             File oldDatabase = new File(plugin.getDataFolder(), "regions.txt");
             if (!oldDatabase.exists()) return;
             
-            logger.info("WorldGuard: The regions database has changed in 4.x. "
+            plugin.getLogger().info("The regions database has changed in 5.x. "
                     + "Your old regions database will be converted to the new format "
-                    + "and set as your primarily world's database.");
+                    + "and set as your primary world's database.");
 
             World w = plugin.getServer().getWorlds().get(0);
             RegionManager mgr = plugin.getGlobalRegionManager().get(w);
 
             // First load up the old database using the CSV loader
-            CSVDatabase db = new CSVDatabase(oldDatabase);
+            CSVDatabase db = new CSVDatabase(oldDatabase, plugin.getLogger());
             db.load();
             
             // Then save the new database
@@ -96,10 +99,9 @@ public class LegacyWorldGuardMigration {
             
             oldDatabase.renameTo(new File(plugin.getDataFolder(), "regions.txt.old"));
 
-            logger.info("WorldGuard: Regions database converted!");
-        } catch (FileNotFoundException e) {
-        } catch (IOException e) {
-            logger.warning("WorldGuard: Failed to load regions: "
+            plugin.getLogger().info("Regions database converted!");
+        } catch (ProtectionDatabaseException e) {
+            plugin.getLogger().warning("Failed to load regions: "
                     + e.getMessage());
         }
     }
@@ -107,8 +109,8 @@ public class LegacyWorldGuardMigration {
     /**
      * Copies a file.
      * 
-     * @param from
-     * @param to
+     * @param from The source file
+     * @param to The destination file
      * @return true if successful
      */
     private static boolean copyFile(File from, File to) {
@@ -129,20 +131,20 @@ public class LegacyWorldGuardMigration {
             out.close();
             
             return true;
-        } catch (FileNotFoundException ex) {
-        } catch (IOException e) {
+        } catch (FileNotFoundException ignore) {
+        } catch (IOException ignore) {
         } finally {
             if (in != null) {
                 try {
                     in.close();
-                } catch (IOException e) {
+                } catch (IOException ignore) {
                 }
             }
             
             if (out != null) {
                 try {
                     out.close();
-                } catch (IOException e) {
+                } catch (IOException ignore) {
                 }
             }
         }

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

@@ -21,6 +21,7 @@ package com.sk89q.worldguard.bukkit;
 
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
@@ -37,7 +38,7 @@ public class LoggerToChatHandler extends Handler {
 
     /**
      * Construct the object.
-     * 
+     *
      * @param player
      */
     public LoggerToChatHandler(CommandSender player) {

src/main/java/com/sk89q/worldguard/bukkit/RegionPermissionModel.java

@@ -0,0 +1,145 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+/**
+ * Used for querying region-related permissions.
+ */
+public class RegionPermissionModel extends AbstractPermissionModel {
+    
+    public RegionPermissionModel(WorldGuardPlugin plugin, CommandSender sender) {
+        super(plugin, sender);
+    }
+    
+    public boolean mayForceLoadRegions() {
+        return hasPluginPermission("region.load");
+    }
+    
+    public boolean mayForceSaveRegions() {
+        return hasPluginPermission("region.save");
+    }
+    
+    public boolean mayMigrateRegionStore() {
+        return hasPluginPermission("region.migratedb");
+    }
+    
+    public boolean mayDefine() {
+        return hasPluginPermission("region.define");
+    }
+    
+    public boolean mayRedefine(ProtectedRegion region) {
+        return hasPatternPermission("redefine", region);
+    }
+    
+    public boolean mayClaim() {
+        return hasPluginPermission("region.claim");
+    }
+    
+    public boolean mayClaimRegionsUnbounded() {
+        return hasPluginPermission("region.unlimited");
+    }
+    
+    public boolean mayDelete(ProtectedRegion region) {
+        return hasPatternPermission("remove", region);
+    }
+    
+    public boolean maySetPriority(ProtectedRegion region) {
+        return hasPatternPermission("setpriority", region);
+    }
+    
+    public boolean maySetParent(ProtectedRegion child, ProtectedRegion parent) {
+        return hasPatternPermission("setparent", child) &&
+                (parent == null ||
+                hasPatternPermission("setparent", parent));
+    }
+    
+    public boolean maySelect(ProtectedRegion region) {
+        return hasPatternPermission("select", region);
+    }
+    
+    public boolean mayLookup(ProtectedRegion region) {
+        return hasPatternPermission("info", region);
+    }
+    
+    public boolean mayTeleportTo(ProtectedRegion region) {
+        return hasPatternPermission("teleport", region);
+    }
+    
+    public boolean mayList() {
+        return hasPluginPermission("region.list");
+    }
+    
+    public boolean mayList(String targetPlayer) {
+        if (targetPlayer == null) {
+            return mayList();
+        }
+        
+        if (targetPlayer.equalsIgnoreCase(getSender().getName())) {
+            return hasPluginPermission("region.list.own");
+        } else {
+            return mayList();
+        }
+    }
+    
+    public boolean maySetFlag(ProtectedRegion region) {
+        return hasPatternPermission("flag.regions", region);
+    }
+    
+    public boolean maySetFlag(ProtectedRegion region, Flag<?> flag) {
+        // This is a WTF permission
+        return hasPatternPermission(
+                "flag.flags." + flag.getName().toLowerCase(), region);
+    }
+    
+    /**
+     * Checks to see if the given sender has permission to modify the given region
+     * using the region permission pattern.
+     * 
+     * @param perm the name of the node
+     * @param region the region
+     */
+    private boolean hasPatternPermission(String perm, ProtectedRegion region) {
+        if (!(getSender() instanceof Player)) {
+            return true; // Non-players (i.e. console, command blocks, etc.) have full power
+        }
+        
+        LocalPlayer localPlayer = getPlugin().wrapPlayer((Player) getSender());
+        String idLower = region.getId().toLowerCase();
+        String effectivePerm;
+        
+        if (region.isOwner(localPlayer)) {
+            return hasPluginPermission("region." + perm + ".own." + idLower) ||
+                    hasPluginPermission("region." + perm + ".member." + idLower);
+        } else if (region.isMember(localPlayer)) {
+            return hasPluginPermission("region." + perm + ".member." + idLower);
+        } else {
+            effectivePerm = "region." + perm + "." + idLower;
+        }
+
+        return hasPluginPermission(effectivePerm);
+    }
+
+}

src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java

@@ -0,0 +1,83 @@
+// $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.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+public class RegionQueryUtil {
+
+    public static boolean isInvincible(WorldGuardPlugin plugin, Player player) {
+        return isInvincible(plugin, player, null);
+    }
+
+    public static boolean isInvincible(WorldGuardPlugin plugin, Player player,
+                                       ApplicableRegionSet set) {
+        Location loc = player.getLocation();
+        World world = player.getWorld();
+        
+        FlagStateManager.PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+
+        if (state.lastInvincibleWorld == null ||
+                !state.lastInvincibleWorld.equals(world) ||
+                state.lastInvincibleX != loc.getBlockX() ||
+                state.lastInvincibleY != loc.getBlockY() ||
+                state.lastInvincibleZ != loc.getBlockZ()) {
+            state.lastInvincibleX = loc.getBlockX();
+            state.lastInvincibleY = loc.getBlockY();
+            state.lastInvincibleZ = loc.getBlockZ();
+            state.lastInvincibleWorld = world;
+
+            if (set == null) {
+                Vector vec = new Vector(state.lastInvincibleX,
+                        state.lastInvincibleY, state.lastInvincibleZ);
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                set = mgr.getApplicableRegions(vec);
+            }
+
+            state.wasInvincible = set.allows(DefaultFlag.INVINCIBILITY, plugin.wrapPlayer(player));
+        }
+
+        return state.wasInvincible;
+    }
+
+    public static Boolean isAllowedInvinciblity(WorldGuardPlugin plugin, Player player) {
+        World world = player.getWorld();
+        FlagStateManager.PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+        Vector vec = new Vector(state.lastInvincibleX, state.lastInvincibleY, state.lastInvincibleZ);
+
+        StateFlag.State regionState = plugin.getGlobalRegionManager().get(world).
+                getApplicableRegions(vec).getFlag(DefaultFlag.INVINCIBILITY, plugin.wrapPlayer(player));
+        if (regionState == StateFlag.State.ALLOW) {
+            return Boolean.TRUE;
+        } else if (regionState == StateFlag.State.DENY) {
+            return Boolean.FALSE;
+        } else {
+            return null;
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java

@@ -23,16 +23,18 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.lang.reflect.*;
+import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.plugin.Plugin;
+
 import com.sk89q.worldguard.protection.GlobalRegionManager;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.Flag;
@@ -54,9 +56,9 @@ public class ReportWriter {
         appendServerInformation(plugin.getServer());
         appendPluginInformation(plugin.getServer().getPluginManager().getPlugins());
         appendWorldInformation(plugin.getServer().getWorlds());
-        appendGlobalConfiguration(plugin.getGlobalConfiguration());
+        appendGlobalConfiguration(plugin.getGlobalStateManager());
         appendWorldConfigurations(plugin, plugin.getServer().getWorlds(),
-                plugin.getGlobalRegionManager(), plugin.getGlobalConfiguration());
+                plugin.getGlobalRegionManager(), plugin.getGlobalStateManager());
         appendln("-------------");
         appendln("END OF REPORT");
         appendln();
@@ -115,17 +117,17 @@ public class ReportWriter {
         appendHeader("Global Configuration");
         
         LogListBlock log = new LogListBlock();
-        LogListBlock entitiesLog = log.putChild("Entities");
         LogListBlock configLog = log.putChild("Configuration");
         
         Class<? extends ConfigurationManager> cls = config.getClass();
         for (Field field : cls.getFields()) {
             try {
+                if (field.getName().equalsIgnoreCase("CONFIG_HEADER")) continue;
                 Object val = field.get(config);
                 configLog.put(field.getName(), val);
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
-            } catch (IllegalAccessException e) {
+            } catch (IllegalAccessException ignore) {
             }
         }
         
@@ -164,7 +166,7 @@ public class ReportWriter {
     }
     
     private void appendPluginInformation(Plugin[] plugins) {
-        appendHeader("Plugins");
+        appendHeader("Plugins (" + plugins.length + ")");
         
         LogListBlock log = new LogListBlock();
         
@@ -203,7 +205,7 @@ public class ReportWriter {
             LogListBlock infoLog = worldLog.putChild("Information");
             LogListBlock entitiesLog = worldLog.putChild("Entities");
             
-            infoLog.put("ID", world.getId());
+            infoLog.put("Seed", world.getSeed());
             infoLog.put("Environment", world.getEnvironment().toString());
             infoLog.put("Player count", world.getPlayers().size());
             infoLog.put("Entity count", world.getEntities().size());
@@ -272,7 +274,7 @@ public class ReportWriter {
                     configLog.put(field.getName(), String.valueOf(val));
                 } catch (IllegalArgumentException e) {
                     e.printStackTrace();
-                } catch (IllegalAccessException e) {
+                } catch (IllegalAccessException ignore) {
                 }
             }
             
@@ -322,7 +324,7 @@ public class ReportWriter {
             if (writer != null) {
                 try {
                     writer.close();
-                } catch (IOException e) {
+                } catch (IOException ignore) {
                 }
             }
         }
@@ -332,5 +334,4 @@ public class ReportWriter {
     public String toString() {
         return output.toString();
     }
-    
 }

src/main/java/com/sk89q/worldguard/bukkit/SpongeUtil.java

@@ -0,0 +1,126 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.isBlockWater;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.setBlockToWater;
+
+import org.bukkit.World;
+
+public class SpongeUtil {
+
+    /**
+     * Remove water around a sponge.
+     *
+     * @param plugin The plugin instace
+     * @param world The world the sponge isin
+     * @param ox The x coordinate of the 'sponge' block
+     * @param oy The y coordinate of the 'sponge' block
+     * @param oz The z coordinate of the 'sponge' block
+     */
+    public static void clearSpongeWater(WorldGuardPlugin plugin, World world, int ox, int oy, int oz) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        for (int cx = -wcfg.spongeRadius; cx <= wcfg.spongeRadius; cx++) {
+            for (int cy = -wcfg.spongeRadius; cy <= wcfg.spongeRadius; cy++) {
+                for (int cz = -wcfg.spongeRadius; cz <= wcfg.spongeRadius; cz++) {
+                    if (isBlockWater(world, ox + cx, oy + cy, oz + cz)) {
+                        world.getBlockAt(ox + cx, oy + cy, oz + cz).setTypeId(0);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Add water around a sponge.
+     * 
+     * @param plugin The plugin instance
+     * @param world The world the sponge is located in
+     * @param ox The x coordinate of the 'sponge' block
+     * @param oy The y coordinate of the 'sponge' block
+     * @param oz The z coordinate of the 'sponge' block
+     */
+    public static void addSpongeWater(WorldGuardPlugin plugin, World world, int ox, int oy, int oz) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        // The negative x edge
+        int cx = ox - wcfg.spongeRadius - 1;
+        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
+            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx + 1, cy, cz);
+                }
+            }
+        }
+
+        // The positive x edge
+        cx = ox + wcfg.spongeRadius + 1;
+        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
+            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx - 1, cy, cz);
+                }
+            }
+        }
+
+        // The negative y edge
+        int cy = oy - wcfg.spongeRadius - 1;
+        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
+            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy + 1, cz);
+                }
+            }
+        }
+
+        // The positive y edge
+        cy = oy + wcfg.spongeRadius + 1;
+        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
+            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy - 1, cz);
+                }
+            }
+        }
+
+        // The negative z edge
+        int cz = oz - wcfg.spongeRadius - 1;
+        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
+            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy, cz + 1);
+                }
+            }
+        }
+
+        // The positive z edge
+        cz = oz + wcfg.spongeRadius + 1;
+        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
+            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy, cz - 1);
+                }
+            }
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java

@@ -0,0 +1,70 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (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
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.World;
+
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+/**
+ * Helper class to get a reference to WorldGuard and its components.
+ */
+public class WGBukkit {
+
+    private WGBukkit() {
+    }
+
+    /**
+     * Get the WorldGuard plugin. If WorldGuard isn't loaded yet, then this will
+     * return null.
+     * <p>
+     * If you are depending on WorldGuard in your plugin, you should place
+     * <code>softdepend: [WorldGuard]</code> or <code>depend: [WorldGuard]</code>
+     * in your plugin.yml so that this won't return null for you.
+     *
+     * @return the WorldGuard plugin or null
+     */
+    public static WorldGuardPlugin getPlugin() {
+        return WorldGuardPlugin.inst();
+    }
+
+    /**
+     * Set cache to null for reload WorldGuardPlugin
+     * @deprecated instance is now stored directly in {@link WorldGuardPlugin}
+     */
+    @Deprecated
+    public static void cleanCache() {
+        // do nothing - plugin instance is stored in plugin class now
+    }
+
+    /**
+     * Returns the region manager for a given world. May return null if WorldGuard
+     * is not loaded or region protection is not enabled for the given world.
+     *
+     * @param world world
+     * @return a region manager or null
+     */
+    public static RegionManager getRegionManager(World world) {
+        if (getPlugin() == null) {
+            return null;
+        }
+        return WorldGuardPlugin.inst().getRegionManager(world);
+    }
+
+}

src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java

@@ -0,0 +1,598 @@
+// $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.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffectType;
+
+import com.sk89q.util.yaml.YAMLFormat;
+import com.sk89q.util.yaml.YAMLProcessor;
+import com.sk89q.worldguard.blacklist.Blacklist;
+import com.sk89q.worldguard.blacklist.BlacklistLogger;
+import com.sk89q.worldguard.blacklist.loggers.ConsoleLoggerHandler;
+import com.sk89q.worldguard.blacklist.loggers.DatabaseLoggerHandler;
+import com.sk89q.worldguard.blacklist.loggers.FileLoggerHandler;
+import com.sk89q.worldguard.chest.ChestProtection;
+import com.sk89q.worldguard.chest.SignChestProtection;
+
+/**
+ * Holds the configuration for individual worlds.
+ *
+ * @author sk89q
+ * @author Michael
+ */
+public class WorldConfiguration {
+
+    public static final String CONFIG_HEADER = "#\r\n" +
+            "# WorldGuard's world configuration file\r\n" +
+            "#\r\n" +
+            "# This is a world configuration file. Anything placed into here will only\r\n" +
+            "# affect this world. If you don't put anything in this file, then the\r\n" +
+            "# settings will be inherited from the main configuration file.\r\n" +
+            "#\r\n" +
+            "# If you see {} below, that means that there are NO entries in this file.\r\n" +
+            "# Remove the {} and add your own entries.\r\n" +
+            "#\r\n";
+
+    private WorldGuardPlugin plugin;
+
+    private String worldName;
+    private YAMLProcessor parentConfig;
+    private YAMLProcessor config;
+    private File blacklistFile;
+
+    private Blacklist blacklist;
+    private ChestProtection chestProtection = new SignChestProtection();
+
+    /* Configuration data start */
+    public boolean summaryOnStart;
+    public boolean opPermissions;
+    public boolean fireSpreadDisableToggle;
+    public boolean itemDurability;
+    public boolean simulateSponge;
+    public int spongeRadius;
+    public boolean disableExpDrops;
+    public Set<PotionEffectType> blockPotions;
+    public boolean blockPotionsAlways;
+    public boolean pumpkinScuba;
+    public boolean redstoneSponges;
+    public boolean noPhysicsGravel;
+    public boolean noPhysicsSand;
+    public boolean ropeLadders;
+    public boolean allowPortalAnywhere;
+    public Set<Integer> preventWaterDamage;
+    public boolean blockLighter;
+    public boolean disableFireSpread;
+    public Set<Integer> disableFireSpreadBlocks;
+    public boolean preventLavaFire;
+    public Set<Integer> allowedLavaSpreadOver;
+    public boolean blockTNTExplosions;
+    public boolean blockTNTBlockDamage;
+    public boolean blockCreeperExplosions;
+    public boolean blockCreeperBlockDamage;
+    public boolean blockWitherExplosions;
+    public boolean blockWitherBlockDamage;
+    public boolean blockWitherSkullExplosions;
+    public boolean blockWitherSkullBlockDamage;
+    public boolean blockEnderDragonBlockDamage;
+    public boolean blockEnderDragonPortalCreation;
+    public boolean blockFireballExplosions;
+    public boolean blockFireballBlockDamage;
+    public boolean blockOtherExplosions;
+    public boolean blockEntityPaintingDestroy;
+    public boolean blockEntityItemFrameDestroy;
+    public boolean blockPluginSpawning;
+    public boolean blockGroundSlimes;
+    public boolean blockZombieDoorDestruction;
+    public boolean disableContactDamage;
+    public boolean disableFallDamage;
+    public boolean disableLavaDamage;
+    public boolean disableFireDamage;
+    public boolean disableLightningDamage;
+    public boolean disableDrowningDamage;
+    public boolean disableSuffocationDamage;
+    public boolean teleportOnSuffocation;
+    public boolean disableVoidDamage;
+    public boolean teleportOnVoid;
+    public boolean disableExplosionDamage;
+    public boolean disableMobDamage;
+    public boolean useRegions;
+    public boolean highFreqFlags;
+    public int regionWand;
+    public Set<EntityType> blockCreatureSpawn;
+    // public boolean useiConomy;
+    // public boolean buyOnClaim;
+    // public double buyOnClaimPrice;
+    public int maxClaimVolume;
+    public boolean claimOnlyInsideExistingRegions;
+    public int maxRegionCountPerPlayer;
+    public boolean antiWolfDumbness;
+    public boolean signChestProtection;
+    public boolean disableSignChestProtectionCheck;
+    public boolean removeInfiniteStacks;
+    public boolean disableCreatureCropTrampling;
+    public boolean disablePlayerCropTrampling;
+    public boolean preventLightningFire;
+    public Set<Integer> disallowedLightningBlocks;
+    public boolean disableThunder;
+    public boolean disableWeather;
+    public boolean alwaysRaining;
+    public boolean alwaysThundering;
+    public boolean disablePigZap;
+    public boolean disableCreeperPower;
+    public boolean disableHealthRegain;
+    public boolean disableMushroomSpread;
+    public boolean disableIceMelting;
+    public boolean disableSnowMelting;
+    public boolean disableSnowFormation;
+    public boolean disableIceFormation;
+    public boolean disableLeafDecay;
+    public boolean disableGrassGrowth;
+    public boolean disableMyceliumSpread;
+    public boolean disableVineGrowth;
+    public boolean disableEndermanGriefing;
+    public boolean disableSnowmanTrails;
+    public boolean regionInvinciblityRemovesMobs;
+    public boolean disableDeathMessages;
+    public boolean disableObsidianGenerators;
+
+    private Map<String, Integer> maxRegionCounts;
+
+    /* Configuration data end */
+
+    /**
+     * Construct the object.
+     *
+     * @param plugin The WorldGuardPlugin instance
+     * @param worldName The world name that this WorldConfiguration is for.
+     * @param parentConfig The parent configuration to read defaults from
+     */
+    public WorldConfiguration(WorldGuardPlugin plugin, String worldName, YAMLProcessor parentConfig) {
+        File baseFolder = new File(plugin.getDataFolder(), "worlds/" + worldName);
+        File configFile = new File(baseFolder, "config.yml");
+        blacklistFile = new File(baseFolder, "blacklist.txt");
+
+        this.plugin = plugin;
+        this.worldName = worldName;
+        this.parentConfig = parentConfig;
+
+        plugin.createDefaultConfiguration(configFile, "config_world.yml");
+        plugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");
+
+        config = new YAMLProcessor(configFile, true, YAMLFormat.EXTENDED);
+        loadConfiguration();
+
+        if (summaryOnStart) {
+            plugin.getLogger().info("Loaded configuration for world '" + worldName + "'");
+        }
+    }
+
+    private boolean getBoolean(String node, boolean def) {
+        boolean val = parentConfig.getBoolean(node, def);
+
+        if (config.getProperty(node) != null) {
+            return config.getBoolean(node, def);
+        } else {
+            return val;
+        }
+    }
+
+    private String getString(String node, String def) {
+        String val = parentConfig.getString(node, def);
+
+        if (config.getProperty(node) != null) {
+            return config.getString(node, def);
+        } else {
+            return val;
+        }
+    }
+
+    private int getInt(String node, int def) {
+        int val = parentConfig.getInt(node, def);
+
+        if (config.getProperty(node) != null) {
+            return config.getInt(node, def);
+        } else {
+            return val;
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private double getDouble(String node, double def) {
+        double val = parentConfig.getDouble(node, def);
+
+        if (config.getProperty(node) != null) {
+            return config.getDouble(node, def);
+        } else {
+            return val;
+        }
+    }
+
+    private List<Integer> getIntList(String node, List<Integer> def) {
+        List<Integer> res = parentConfig.getIntList(node, def);
+
+        if (res == null || res.size() == 0) {
+            parentConfig.setProperty(node, new ArrayList<Integer>());
+        }
+
+        if (config.getProperty(node) != null) {
+            res = config.getIntList(node, def);
+        }
+
+        return res;
+    }
+
+    private List<String> getStringList(String node, List<String> def) {
+        List<String> res = parentConfig.getStringList(node, def);
+
+        if (res == null || res.size() == 0) {
+            parentConfig.setProperty(node, new ArrayList<String>());
+        }
+
+        if (config.getProperty(node) != null) {
+            res = config.getStringList(node, def);
+        }
+
+        return res;
+    }
+
+    private List<String> getKeys(String node) {
+        List<String> res = parentConfig.getKeys(node);
+
+        if (res == null || res.size() == 0) {
+            res = config.getKeys(node);
+        }
+        if (res == null) {
+            res = new ArrayList<String>();
+        }
+
+        return res;
+    }
+
+    private Object getProperty(String node) {
+        Object res = parentConfig.getProperty(node);
+
+        if (config.getProperty(node) != null) {
+            res = config.getProperty(node);
+        }
+
+        return res;
+    }
+
+    /**
+     * Load the configuration.
+     */
+    private void loadConfiguration() {
+        try {
+            config.load();
+        } catch (IOException e) {
+            plugin.getLogger().severe("Error reading configuration for world " + worldName + ": ");
+            e.printStackTrace();
+        }
+
+        summaryOnStart = getBoolean("summary-on-start", true);
+        opPermissions = getBoolean("op-permissions", true);
+
+        itemDurability = getBoolean("protection.item-durability", true);
+        removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);
+        disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false);
+        disableObsidianGenerators = getBoolean("protection.disable-obsidian-generators", false);
+
+        blockPotions = new HashSet<PotionEffectType>();
+        for (String potionName : getStringList("gameplay.block-potions", null)) {
+            PotionEffectType effect = PotionEffectType.getByName(potionName);
+
+            if (effect == null) {
+                plugin.getLogger().warning("Unknown potion effect type '" + potionName + "'");
+            } else {
+                blockPotions.add(effect);
+            }
+        }
+        blockPotionsAlways = getBoolean("gameplay.block-potions-overly-reliably", false);
+
+        simulateSponge = getBoolean("simulation.sponge.enable", true);
+        spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1;
+        redstoneSponges = getBoolean("simulation.sponge.redstone", false);
+
+        pumpkinScuba = getBoolean("default.pumpkin-scuba", false);
+        disableHealthRegain = getBoolean("default.disable-health-regain", false);
+
+        noPhysicsGravel = getBoolean("physics.no-physics-gravel", false);
+        noPhysicsSand = getBoolean("physics.no-physics-sand", false);
+        ropeLadders = getBoolean("physics.vine-like-rope-ladders", false);
+        allowPortalAnywhere = getBoolean("physics.allow-portal-anywhere", false);
+        preventWaterDamage = new HashSet<Integer>(getIntList("physics.disable-water-damage-blocks", null));
+
+        blockTNTExplosions = getBoolean("ignition.block-tnt", false);
+        blockTNTBlockDamage = getBoolean("ignition.block-tnt-block-damage", false);
+        blockLighter = getBoolean("ignition.block-lighter", false);
+
+        preventLavaFire = getBoolean("fire.disable-lava-fire-spread", true);
+        disableFireSpread = getBoolean("fire.disable-all-fire-spread", false);
+        disableFireSpreadBlocks = new HashSet<Integer>(getIntList("fire.disable-fire-spread-blocks", null));
+        allowedLavaSpreadOver = new HashSet<Integer>(getIntList("fire.lava-spread-blocks", null));
+
+        blockCreeperExplosions = getBoolean("mobs.block-creeper-explosions", false);
+        blockCreeperBlockDamage = getBoolean("mobs.block-creeper-block-damage", false);
+        blockWitherExplosions = getBoolean("mobs.block-wither-explosions", false);
+        blockWitherBlockDamage = getBoolean("mobs.block-wither-block-damage", false);
+        blockWitherSkullExplosions = getBoolean("mobs.block-wither-skull-explosions", false);
+        blockWitherSkullBlockDamage = getBoolean("mobs.block-wither-skull-block-damage", false);
+        blockEnderDragonBlockDamage = getBoolean("mobs.block-enderdragon-block-damage", false);
+        blockEnderDragonPortalCreation = getBoolean("mobs.block-enderdragon-portal-creation", false);
+        blockFireballExplosions = getBoolean("mobs.block-fireball-explosions", false);
+        blockFireballBlockDamage = getBoolean("mobs.block-fireball-block-damage", false);
+        antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
+        disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);
+        disableSnowmanTrails = getBoolean("mobs.disable-snowman-trails", false);
+        blockEntityPaintingDestroy = getBoolean("mobs.block-painting-destroy", false);
+        blockEntityItemFrameDestroy = getBoolean("mobs.block-item-frame-destroy", false);
+        blockPluginSpawning = getBoolean("mobs.block-plugin-spawning", true);
+        blockGroundSlimes = getBoolean("mobs.block-above-ground-slimes", false);
+        blockOtherExplosions = getBoolean("mobs.block-other-explosions", false);
+        blockZombieDoorDestruction = getBoolean("mobs.block-zombie-door-destruction", false);
+
+        disableFallDamage = getBoolean("player-damage.disable-fall-damage", false);
+        disableLavaDamage = getBoolean("player-damage.disable-lava-damage", false);
+        disableFireDamage = getBoolean("player-damage.disable-fire-damage", false);
+        disableLightningDamage = getBoolean("player-damage.disable-lightning-damage", false);
+        disableDrowningDamage = getBoolean("player-damage.disable-drowning-damage", false);
+        disableSuffocationDamage = getBoolean("player-damage.disable-suffocation-damage", false);
+        disableContactDamage = getBoolean("player-damage.disable-contact-damage", false);
+        teleportOnSuffocation = getBoolean("player-damage.teleport-on-suffocation", false);
+        disableVoidDamage = getBoolean("player-damage.disable-void-damage", false);
+        teleportOnVoid = getBoolean("player-damage.teleport-on-void-falling", false);
+        disableExplosionDamage = getBoolean("player-damage.disable-explosion-damage", false);
+        disableMobDamage = getBoolean("player-damage.disable-mob-damage", false);
+        disableDeathMessages = getBoolean("player-damage.disable-death-messages", false);
+
+        signChestProtection = getBoolean("chest-protection.enable", false);
+        disableSignChestProtectionCheck = getBoolean("chest-protection.disable-off-check", false);
+
+        disableCreatureCropTrampling = getBoolean("crops.disable-creature-trampling", false);
+        disablePlayerCropTrampling = getBoolean("crops.disable-player-trampling", false);
+
+        disallowedLightningBlocks = new HashSet<Integer>(getIntList("weather.prevent-lightning-strike-blocks", null));
+        preventLightningFire = getBoolean("weather.disable-lightning-strike-fire", false);
+        disableThunder = getBoolean("weather.disable-thunderstorm", false);
+        disableWeather = getBoolean("weather.disable-weather", false);
+        disablePigZap = getBoolean("weather.disable-pig-zombification", false);
+        disableCreeperPower = getBoolean("weather.disable-powered-creepers", false);
+        alwaysRaining = getBoolean("weather.always-raining", false);
+        alwaysThundering = getBoolean("weather.always-thundering", false);
+
+        disableMushroomSpread = getBoolean("dynamics.disable-mushroom-spread", false);
+        disableIceMelting = getBoolean("dynamics.disable-ice-melting", false);
+        disableSnowMelting = getBoolean("dynamics.disable-snow-melting", false);
+        disableSnowFormation = getBoolean("dynamics.disable-snow-formation", false);
+        disableIceFormation = getBoolean("dynamics.disable-ice-formation", false);
+        disableLeafDecay = getBoolean("dynamics.disable-leaf-decay", false);
+        disableGrassGrowth = getBoolean("dynamics.disable-grass-growth", false);
+        disableMyceliumSpread = getBoolean("dynamics.disable-mycelium-spread", false);
+        disableVineGrowth = getBoolean("dynamics.disable-vine-growth", false);
+
+        useRegions = getBoolean("regions.enable", true);
+        regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
+        highFreqFlags = getBoolean("regions.high-frequency-flags", false);
+        regionWand = getInt("regions.wand", 334);
+        maxClaimVolume = getInt("regions.max-claim-volume", 30000);
+        claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false);
+
+        maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player.default", 7);
+        maxRegionCounts = new HashMap<String, Integer>();
+        maxRegionCounts.put(null, maxRegionCountPerPlayer);
+
+        for (String key : getKeys("regions.max-region-count-per-player")) {
+            if (!key.equalsIgnoreCase("default")) {
+                Object val = getProperty("regions.max-region-count-per-player." + key);
+                if (val != null && val instanceof Number) {
+                    maxRegionCounts.put(key, ((Number) val).intValue());
+                }
+            }
+        }
+
+        // useiConomy = getBoolean("iconomy.enable", false);
+        // buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
+        // buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);
+
+        blockCreatureSpawn = new HashSet<EntityType>();
+        for (String creatureName : getStringList("mobs.block-creature-spawn", null)) {
+            EntityType creature = EntityType.fromName(creatureName);
+
+            if (creature == null) {
+                plugin.getLogger().warning("Unknown mob type '" + creatureName + "'");
+            } else if (!creature.isAlive()) {
+                plugin.getLogger().warning("Entity type '" + creatureName + "' is not a creature");
+            } else {
+                blockCreatureSpawn.add(creature);
+            }
+        }
+
+        boolean useBlacklistAsWhitelist = getBoolean("blacklist.use-as-whitelist", false);
+
+        // Console log configuration
+        boolean logConsole = getBoolean("blacklist.logging.console.enable", true);
+
+        // Database log configuration
+        boolean logDatabase = getBoolean("blacklist.logging.database.enable", false);
+        String dsn = getString("blacklist.logging.database.dsn", "jdbc:mysql://localhost:3306/minecraft");
+        String user = getString("blacklist.logging.database.user", "root");
+        String pass = getString("blacklist.logging.database.pass", "");
+        String table = getString("blacklist.logging.database.table", "blacklist_events");
+
+        // File log configuration
+        boolean logFile = getBoolean("blacklist.logging.file.enable", false);
+        String logFilePattern = getString("blacklist.logging.file.path", "worldguard/logs/%Y-%m-%d.log");
+        int logFileCacheSize = Math.max(1, 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(useBlacklistAsWhitelist, plugin);
+            blist.load(blacklistFile);
+
+            // 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;
+                if (summaryOnStart) {
+                    plugin.getLogger().log(Level.INFO, "Blacklist loaded.");
+                }
+
+                BlacklistLogger blacklistLogger = blist.getLogger();
+
+                if (logDatabase) {
+                    blacklistLogger.addHandler(new DatabaseLoggerHandler(dsn, user, pass, table, worldName, plugin.getLogger()));
+                }
+
+                if (logConsole) {
+                    blacklistLogger.addHandler(new ConsoleLoggerHandler(worldName, plugin.getLogger()));
+                }
+
+                if (logFile) {
+                    FileLoggerHandler handler =
+                            new FileLoggerHandler(logFilePattern, logFileCacheSize, worldName, plugin.getLogger());
+                    blacklistLogger.addHandler(handler);
+                }
+            }
+        } catch (FileNotFoundException e) {
+            plugin.getLogger().log(Level.WARNING, "WorldGuard blacklist does not exist.");
+        } catch (IOException e) {
+            plugin.getLogger().log(Level.WARNING, "Could not load WorldGuard blacklist: "
+                    + e.getMessage());
+        }
+
+        // Print an overview of settings
+        if (summaryOnStart) {
+            plugin.getLogger().log(Level.INFO, blockTNTExplosions
+                    ? "(" + worldName + ") TNT ignition is blocked."
+                    : "(" + worldName + ") TNT ignition is PERMITTED.");
+            plugin.getLogger().log(Level.INFO, blockLighter
+                    ? "(" + worldName + ") Lighters are blocked."
+                    : "(" + worldName + ") Lighters are PERMITTED.");
+            plugin.getLogger().log(Level.INFO, preventLavaFire
+                    ? "(" + worldName + ") Lava fire is blocked."
+                    : "(" + worldName + ") Lava fire is PERMITTED.");
+
+            if (disableFireSpread) {
+                plugin.getLogger().log(Level.INFO, "(" + worldName + ") All fire spread is disabled.");
+            } else {
+                if (disableFireSpreadBlocks.size() > 0) {
+                    plugin.getLogger().log(Level.INFO, "(" + worldName
+                            + ") Fire spread is limited to "
+                            + disableFireSpreadBlocks.size() + " block types.");
+                } else {
+                    plugin.getLogger().log(Level.INFO, "(" + worldName
+                            + ") Fire spread is UNRESTRICTED.");
+                }
+            }
+        }
+
+        config.setHeader(CONFIG_HEADER);
+
+        config.save();
+    }
+
+    public Blacklist getBlacklist() {
+        return this.blacklist;
+    }
+
+    public String getWorldName() {
+        return this.worldName;
+    }
+
+    public boolean isChestProtected(Block block, Player player) {
+        if (!signChestProtection) {
+            return false;
+        }
+        if (plugin.hasPermission(player, "worldguard.chest-protection.override")
+                || plugin.hasPermission(player, "worldguard.override.chest-protection")) {
+            return false;
+        }
+        return chestProtection.isProtected(block, player);
+    }
+
+    public boolean isChestProtected(Block block) {
+
+        return signChestProtection && chestProtection.isProtected(block, null);
+    }
+
+    public boolean isChestProtectedPlacement(Block block, Player player) {
+        if (!signChestProtection) {
+            return false;
+        }
+        if (plugin.hasPermission(player, "worldguard.chest-protection.override")
+                || plugin.hasPermission(player, "worldguard.override.chest-protection")) {
+            return false;
+        }
+        return chestProtection.isProtectedPlacement(block, player);
+    }
+
+    public boolean isAdjacentChestProtected(Block block, Player player) {
+        if (!signChestProtection) {
+            return false;
+        }
+        if (plugin.hasPermission(player, "worldguard.chest-protection.override")
+                || plugin.hasPermission(player, "worldguard.override.chest-protection")) {
+            return false;
+        }
+        return chestProtection.isAdjacentChestProtected(block, player);
+    }
+
+    public ChestProtection getChestProtection() {
+        return chestProtection;
+    }
+
+    public int getMaxRegionCount(Player player) {
+        int max = -1;
+        for (String group : plugin.getGroups(player)) {
+            if (maxRegionCounts.containsKey(group)) {
+                int groupMax = maxRegionCounts.get(group);
+                if (max < groupMax) {
+                    max = groupMax;
+                }
+            }
+        }
+        if (max <= -1) {
+            max = maxRegionCountPerPlayer;
+        }
+        return max;
+    }
+}

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

@@ -0,0 +1,912 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Snowman;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockDispenseEvent;
+import org.bukkit.event.block.BlockExpEvent;
+import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.block.BlockFormEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.BlockRedstoneEvent;
+import org.bukkit.event.block.BlockSpreadEvent;
+import org.bukkit.event.block.EntityBlockFormEvent;
+import org.bukkit.event.block.LeavesDecayEvent;
+import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.Potion;
+import org.bukkit.potion.PotionEffect;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.blocks.BlockType;
+import com.sk89q.worldedit.blocks.ItemType;
+import com.sk89q.worldguard.LocalPlayer;
+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.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+/**
+ * The listener for block events.
+ *
+ * @author sk89q
+ */
+public class WorldGuardBlockListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object.
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardBlockListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    /**
+     * Get the world configuration given a world.
+     *
+     * @param world The world to get the configuration for.
+     * @return The configuration for {@code world}
+     */
+    protected WorldConfiguration getWorldConfig(World world) {
+        return plugin.getGlobalStateManager().get(world);
+    }
+
+    /**
+     * Get the world configuration given a player.
+     *
+     * @param player The player to get the wold from
+     * @return The {@link WorldConfiguration} for the player's world
+     */
+    protected WorldConfiguration getWorldConfig(Player player) {
+        return getWorldConfig(player.getWorld());
+    }
+
+    /*
+     * Called when a block is damaged.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockDamage(BlockDamageEvent event) {
+        Player player = event.getPlayer();
+        Block blockDamaged = event.getBlock();
+
+        // Cake are damaged and not broken when they are eaten, so we must
+        // handle them a bit separately
+        if (blockDamaged.getTypeId() == BlockID.CAKE_BLOCK) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, blockDamaged)) {
+                player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a block is broken.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockBreak(BlockBreakEvent event) {
+        Player player = event.getPlayer();
+        WorldConfiguration wcfg = getWorldConfig(player);
+
+        if (!wcfg.itemDurability) {
+            ItemStack held = player.getItemInHand();
+            if (held.getTypeId() > 0
+                    && !(ItemType.usesDamageValue(held.getTypeId())
+                    || BlockType.usesData(held.getTypeId()))) {
+                held.setDurability((short) 0);
+                player.setItemInHand(held);
+            }
+        }
+
+        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlock())
+         || !plugin.getGlobalRegionManager().canConstruct(player, event.getBlock())) {
+            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.getBlacklist() != null) {
+            if (!wcfg.getBlacklist().check(
+                    new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                    toVector(event.getBlock()),
+                    event.getBlock().getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (!wcfg.getBlacklist().check(
+                    new DestroyWithBlacklistEvent(plugin.wrapPlayer(player),
+                    toVector(event.getBlock()),
+                    player.getItemInHand().getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.isChestProtected(event.getBlock(), player)) {
+            player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
+            event.setCancelled(true);
+            return;
+        }
+    }
+
+    /*
+     * Called when fluids flow.
+     */
+    @EventHandler(ignoreCancelled = true)
+    public void onBlockFromTo(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;
+        boolean isAir = blockFrom.getTypeId() == 0;
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.simulateSponge && isWater) {
+            int ox = blockTo.getX();
+            int oy = blockTo.getY();
+            int oz = blockTo.getZ();
+
+            for (int cx = -wcfg.spongeRadius; cx <= wcfg.spongeRadius; cx++) {
+                for (int cy = -wcfg.spongeRadius; cy <= wcfg.spongeRadius; cy++) {
+                    for (int cz = -wcfg.spongeRadius; cz <= wcfg.spongeRadius; cz++) {
+                        Block sponge = world.getBlockAt(ox + cx, oy + cy, oz + cz);
+                        if (sponge.getTypeId() == 19
+                                && (!wcfg.redstoneSponges || !sponge.isBlockIndirectlyPowered())) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+
+        /*if (plugin.classicWater && isWater) {
+        int blockBelow = blockFrom.getRelative(0, -1, 0).getTypeId();
+        if (blockBelow != 0 && blockBelow != 8 && blockBelow != 9) {
+        blockFrom.setTypeId(9);
+        if (blockTo.getTypeId() == 0) {
+        blockTo.setTypeId(9);
+        }
+        return;
+        }
+        }*/
+
+        // Check the fluid block (from) whether it is air.
+        // If so and the target block is protected, cancel the event
+        if (wcfg.preventWaterDamage.size() > 0) {
+            int targetId = blockTo.getTypeId();
+
+            if ((isAir || isWater) &&
+                    wcfg.preventWaterDamage.contains(targetId)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.allowedLavaSpreadOver.size() > 0 && isLava) {
+            int targetId = blockTo.getRelative(0, -1, 0).getTypeId();
+
+            if (!wcfg.allowedLavaSpreadOver.contains(targetId)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.highFreqFlags && isWater
+                && !plugin.getGlobalRegionManager().allows(DefaultFlag.WATER_FLOW,
+                blockFrom.getLocation())) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.highFreqFlags && isLava
+                && !plugin.getGlobalRegionManager().allows(DefaultFlag.LAVA_FLOW,
+                blockFrom.getLocation())) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.disableObsidianGenerators && (isAir || isLava)
+                && blockTo.getTypeId() == 55) {
+            blockTo.setTypeId(0);
+            return;
+        }
+    }
+
+    /*
+     * Called when a block gets ignited.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockIgnite(BlockIgniteEvent event) {
+        IgniteCause cause = event.getCause();
+        Block block = event.getBlock();
+        World world = block.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+        boolean isFireSpread = cause == IgniteCause.SPREAD;
+
+        if (wcfg.preventLightningFire && cause == IgniteCause.LIGHTNING) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.preventLavaFire && cause == IgniteCause.LAVA) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.disableFireSpread && isFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.blockLighter && (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL)
+                && event.getPlayer() != null
+                && !plugin.hasPermission(event.getPlayer(), "worldguard.override.lighter")) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.fireSpreadDisableToggle && isFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.disableFireSpreadBlocks.size() > 0 && isFireSpread) {
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
+
+            if (wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y - 1, z))
+                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x + 1, y, z))
+                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x - 1, y, z))
+                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z - 1))
+                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z + 1))) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.useRegions) {
+            Vector pt = toVector(block);
+            Player player = event.getPlayer();
+            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+            if (player != null && !plugin.getGlobalRegionManager().hasBypass(player, world)) {
+                LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+                // this is preliminarily handled in the player listener under handleBlockRightClick
+                // why it's handled here too, no one knows
+                if (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL) {
+                    if (!set.allows(DefaultFlag.LIGHTER)
+                            && !set.canBuild(localPlayer)
+                            && !plugin.hasPermission(player, "worldguard.override.lighter")) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+
+            if (wcfg.highFreqFlags && isFireSpread
+                    && !set.allows(DefaultFlag.FIRE_SPREAD)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.highFreqFlags && cause == IgniteCause.LAVA
+                    && !set.allows(DefaultFlag.LAVA_FIRE)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (cause == IgniteCause.FIREBALL && event.getPlayer() == null) {
+                // wtf bukkit, FIREBALL is supposed to be reserved to players
+                if (!set.allows(DefaultFlag.GHAST_FIREBALL)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (cause == IgniteCause.LIGHTNING && !set.allows(DefaultFlag.LIGHTNING)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a block is destroyed from burning.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockBurn(BlockBurnEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.disableFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.fireSpreadDisableToggle) {
+            Block block = event.getBlock();
+            event.setCancelled(true);
+            checkAndDestroyAround(block.getWorld(), block.getX(), block.getY(), block.getZ(), BlockID.FIRE);
+            return;
+        }
+
+        if (wcfg.disableFireSpreadBlocks.size() > 0) {
+            Block block = event.getBlock();
+
+            if (wcfg.disableFireSpreadBlocks.contains(block.getTypeId())) {
+                event.setCancelled(true);
+                checkAndDestroyAround(block.getWorld(), block.getX(), block.getY(), block.getZ(), BlockID.FIRE);
+                return;
+            }
+        }
+
+        if (wcfg.isChestProtected(event.getBlock())) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.useRegions) {
+            Block block = event.getBlock();
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
+            Vector pt = toVector(block);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(block.getWorld());
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+            if (!set.allows(DefaultFlag.FIRE_SPREAD)) {
+                checkAndDestroyAround(block.getWorld(), x, y, z, BlockID.FIRE);
+                event.setCancelled(true);
+                return;
+            }
+
+        }
+    }
+
+    private void checkAndDestroyAround(World world, int x, int y, int z, int required) {
+        checkAndDestroy(world, x, y, z + 1, required);
+        checkAndDestroy(world, x, y, z - 1, required);
+        checkAndDestroy(world, x, y + 1, z, required);
+        checkAndDestroy(world, x, y - 1, z, required);
+        checkAndDestroy(world, x + 1, y, z, required);
+        checkAndDestroy(world, x - 1, y, z, required);
+    }
+
+    private void checkAndDestroy(World world, int x, int y, int z, int required) {
+        if (world.getBlockTypeIdAt(x, y, z) == required) {
+            world.getBlockAt(x, y, z).setTypeId(BlockID.AIR);
+        }
+    }
+
+    /*
+     * Called when block physics occurs.
+     */
+    @EventHandler(ignoreCancelled = true)
+    public void onBlockPhysics(BlockPhysicsEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        int id = event.getChangedTypeId();
+
+        if (id == 13 && wcfg.noPhysicsGravel) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (id == 12 && wcfg.noPhysicsSand) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (id == 90 && wcfg.allowPortalAnywhere) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.ropeLadders && event.getBlock().getType() == Material.LADDER) {
+            if (event.getBlock().getRelative(0, 1, 0).getType() == Material.LADDER) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a player places a block.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockPlace(BlockPlaceEvent event) {
+        Block blockPlaced = event.getBlock();
+        Player player = event.getPlayer();
+        World world = blockPlaced.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.useRegions) {
+            final Location location = blockPlaced.getLocation();
+            if (!plugin.getGlobalRegionManager().canBuild(player, location)
+             || !plugin.getGlobalRegionManager().canConstruct(player, location)) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.getBlacklist() != null) {
+            if (!wcfg.getBlacklist().check(
+                    new BlockPlaceBlacklistEvent(plugin.wrapPlayer(player), toVector(blockPlaced),
+                    blockPlaced.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.signChestProtection && wcfg.getChestProtection().isChest(blockPlaced.getTypeId())) {
+            if (wcfg.isAdjacentChestProtected(event.getBlock(), player)) {
+                player.sendMessage(ChatColor.DARK_RED + "This spot is for a chest that you don't have permission for.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.simulateSponge && blockPlaced.getTypeId() == 19) {
+            if (wcfg.redstoneSponges && blockPlaced.isBlockIndirectlyPowered()) {
+                return;
+            }
+
+            int ox = blockPlaced.getX();
+            int oy = blockPlaced.getY();
+            int oz = blockPlaced.getZ();
+
+            SpongeUtil.clearSpongeWater(plugin, world, ox, oy, oz);
+        }
+    }
+
+    /*
+     * Called when redstone changes.
+     */
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockRedstoneChange(BlockRedstoneEvent event) {
+        Block blockTo = event.getBlock();
+        World world = blockTo.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.simulateSponge && wcfg.redstoneSponges) {
+            int ox = blockTo.getX();
+            int oy = blockTo.getY();
+            int oz = blockTo.getZ();
+
+            for (int cx = -1; cx <= 1; cx++) {
+                for (int cy = -1; cy <= 1; cy++) {
+                    for (int cz = -1; cz <= 1; cz++) {
+                        Block sponge = world.getBlockAt(ox + cx, oy + cy, oz + cz);
+                        if (sponge.getTypeId() == 19
+                                && sponge.isBlockIndirectlyPowered()) {
+                            SpongeUtil.clearSpongeWater(plugin, world, ox + cx, oy + cy, oz + cz);
+                        } else if (sponge.getTypeId() == 19
+                                && !sponge.isBlockIndirectlyPowered()) {
+                            SpongeUtil.addSpongeWater(plugin, world, ox + cx, oy + cy, oz + cz);
+                        }
+                    }
+                }
+            }
+
+            return;
+        }
+    }
+
+    /*
+     * Called when a sign is changed.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onSignChange(SignChangeEvent event) {
+        Player player = event.getPlayer();
+        WorldConfiguration wcfg = getWorldConfig(player);
+
+        if (wcfg.signChestProtection) {
+            if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
+                if (wcfg.isChestProtectedPlacement(event.getBlock(), player)) {
+                    player.sendMessage(ChatColor.DARK_RED + "You do not own the adjacent chest.");
+                    event.getBlock().breakNaturally();
+                    event.setCancelled(true);
+                    return;
+                }
+
+                if (event.getBlock().getTypeId() != BlockID.SIGN_POST) {
+                    player.sendMessage(ChatColor.RED
+                            + "The [Lock] sign must be a sign post, not a wall sign.");
+
+                    event.getBlock().breakNaturally();
+                    event.setCancelled(true);
+                    return;
+                }
+
+                if (!event.getLine(1).equalsIgnoreCase(player.getName())) {
+                    player.sendMessage(ChatColor.RED
+                            + "The first owner line must be your name.");
+
+                    event.getBlock().breakNaturally();
+                    event.setCancelled(true);
+                    return;
+                }
+
+                int below = event.getBlock().getRelative(0, -1, 0).getTypeId();
+
+                if (below == BlockID.TNT || below == BlockID.SAND
+                        || below == BlockID.GRAVEL || below == BlockID.SIGN_POST) {
+                    player.sendMessage(ChatColor.RED
+                            + "That is not a safe block that you're putting this sign on.");
+
+                    event.getBlock().breakNaturally();
+                    event.setCancelled(true);
+                    return;
+                }
+
+                event.setLine(0, "[Lock]");
+                player.sendMessage(ChatColor.YELLOW
+                        + "A chest or double chest above is now protected.");
+            }
+        } else if (!wcfg.disableSignChestProtectionCheck) {
+            if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
+                player.sendMessage(ChatColor.RED
+                        + "WorldGuard's sign chest protection is disabled.");
+
+                event.getBlock().breakNaturally();
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlock())) {
+            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+            event.setCancelled(true);
+            return;
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onLeavesDecay(LeavesDecayEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.disableLeafDecay) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.LEAF_DECAY,
+                    event.getBlock().getLocation())) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    /*
+     * Called when a block is formed based on world conditions.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockForm(BlockFormEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        int type = event.getNewState().getTypeId();
+
+        if (type == BlockID.ICE) {
+            if (wcfg.disableIceFormation) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.ICE_FORM, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (type == BlockID.SNOW) {
+            if (wcfg.disableSnowFormation) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.SNOW_FALL, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a block is formed by an entity.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityBlockForm(EntityBlockFormEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (event.getEntity() instanceof Snowman) {
+            if (wcfg.disableSnowmanTrails) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a block spreads based on world conditions.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockSpread(BlockSpreadEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        int fromType = event.getSource().getTypeId();
+
+        if (fromType == BlockID.RED_MUSHROOM || fromType == BlockID.BROWN_MUSHROOM) {
+            if (wcfg.disableMushroomSpread) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.MUSHROOMS, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (fromType == BlockID.GRASS) {
+            if (wcfg.disableGrassGrowth) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.GRASS_SPREAD, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (fromType == BlockID.MYCELIUM) {
+            if (wcfg.disableMyceliumSpread) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(
+                            DefaultFlag.MYCELIUM_SPREAD, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (fromType == BlockID.VINE) {
+            if (wcfg.disableVineGrowth) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(
+                            DefaultFlag.VINE_GROWTH, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a block fades.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockFade(BlockFadeEvent event) {
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        int type = event.getBlock().getTypeId();
+
+        if (type == BlockID.ICE) {
+            if (wcfg.disableIceMelting) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.ICE_MELT, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (type == BlockID.SNOW) {
+            if (wcfg.disableSnowMelting) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.SNOW_MELT, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a piston extends
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+            for (Block block : event.getBlocks()) {
+                if (!plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, block.getLocation())) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+    }
+
+    /*
+     * Called when a piston retracts
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (wcfg.useRegions && event.isSticky()) {
+            if (!(plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getRetractLocation()))
+                    || !(plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getBlock().getLocation()))) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a block is damaged.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockDispense(BlockDispenseEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (wcfg.blockPotions.size() > 0) {
+            ItemStack item = event.getItem();
+            if (item.getType() == Material.POTION && !BukkitUtil.isWaterPotion(item)) {
+                Potion potion = Potion.fromDamage(BukkitUtil.getPotionEffectBits(item));
+                for (PotionEffect effect : potion.getEffects()) {
+                    if (potion.isSplash() && wcfg.blockPotions.contains(effect.getType())) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+     * Called when a block yields exp
+     */
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockExp(BlockExpEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getBlock().getLocation())) {
+            event.setExpToDrop(0);
+        }
+    }
+
+}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardCommandBookListener.java

@@ -0,0 +1,75 @@
+/*
+ * WorldGuard
+ * Copyright (C) 2012 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 com.sk89q.commandbook.InfoComponent;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+/**
+ * @author zml2008
+ */
+public class WorldGuardCommandBookListener implements Listener {
+    private final WorldGuardPlugin plugin;
+    
+    public WorldGuardCommandBookListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+    
+    @EventHandler
+    public void onPlayerWhois(InfoComponent.PlayerWhoisEvent event) {
+        if (event.getPlayer() instanceof Player) {
+            Player player = (Player) event.getPlayer();
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+            if (plugin.getGlobalStateManager().get(player.getWorld()).useRegions) {
+                ApplicableRegionSet regions = plugin.getGlobalRegionManager()
+                        .get(player.getWorld()).getApplicableRegions(player.getLocation());
+                
+                // Current regions
+                StringBuilder regionStr = new StringBuilder();
+                boolean first = true;
+                
+                for (ProtectedRegion region : regions) {
+                    if (!first) {
+                        regionStr.append(", ");
+                    }
+                    
+                    if (region.isOwner(localPlayer)) {
+                        regionStr.append("+");
+                    } else if (region.isMemberOnly(localPlayer)) {
+                        regionStr.append("-");
+                    }
+                    
+                    regionStr.append(region.getId());
+                    
+                    first = false;
+                }
+                
+                if (regions.size() > 0) {
+                    event.addWhoisInformation("Current Regions", regionStr);
+                }
+                event.addWhoisInformation("Can build", regions.canBuild(localPlayer));
+            }
+        }
+    }
+}

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

@@ -0,0 +1,988 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import java.util.Set;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.EnderDragon;
+import org.bukkit.entity.EnderPearl;
+import org.bukkit.entity.Enderman;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Fireball;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.ThrownPotion;
+import org.bukkit.entity.Wither;
+import org.bukkit.entity.WitherSkull;
+import org.bukkit.entity.Wolf;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.event.entity.CreeperPowerEvent;
+import org.bukkit.event.entity.EntityBreakDoorEvent;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
+import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.EntityCreatePortalEvent;
+import org.bukkit.event.entity.EntityDamageByBlockEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntityInteractEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.ExpBottleEvent;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.PigZapEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.GlobalRegionManager;
+import com.sk89q.worldguard.protection.events.DisallowedPVPEvent;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+/**
+ * Listener for entity related events.
+ *
+ * @author sk89q
+ */
+public class WorldGuardEntityListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    private EntityType tntMinecartType;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardEntityListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+        tntMinecartType = BukkitUtil.tryEnum(EntityType.class, "MINECART_TNT");
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityInteract(EntityInteractEvent event) {
+        Entity entity = event.getEntity();
+        Block block = event.getBlock();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (block.getTypeId() == BlockID.SOIL) {
+            if (/* entity instanceof Creature && // catch for any entity (not thrown for players) */
+                wcfg.disableCreatureCropTrampling) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onExpBottle(ExpBottleEvent event) {
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getEntity().getWorld());
+
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getEntity().getLocation())) {
+            event.setExperience(0);
+            // event.setShowEffect(false); // don't want to cancel the bottle entirely I suppose, just the exp
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onEntityDeath(EntityDeathEvent event) {
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getEntity().getWorld());
+
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getEntity().getLocation())) {
+            event.setDroppedExp(0);
+        }
+
+        if (event instanceof PlayerDeathEvent && wcfg.disableDeathMessages) {
+            ((PlayerDeathEvent) event).setDeathMessage("");
+        }
+    }
+
+    private void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
+        Entity defender = event.getEntity();
+        DamageCause type = event.getCause();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(defender.getWorld());
+
+        if (defender instanceof Wolf && ((Wolf) defender).isTamed()) {
+            if (wcfg.antiWolfDumbness && !(type == DamageCause.VOID)) {
+                event.setCancelled(true);
+                return;
+            }
+        } else if (defender instanceof Player) {
+            Player player = (Player) defender;
+
+            if (isInvincible(player)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableLavaDamage && type == DamageCause.LAVA) {
+                event.setCancelled(true);
+                player.setFireTicks(0);
+                return;
+            }
+
+            if (wcfg.disableContactDamage && type == DamageCause.CONTACT) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.teleportOnVoid && type == DamageCause.VOID) {
+                BukkitUtil.findFreePosition(player);
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableVoidDamage && type == DamageCause.VOID) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (type == DamageCause.BLOCK_EXPLOSION
+                    && (wcfg.disableExplosionDamage || wcfg.blockOtherExplosions
+                            || !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, player.getLocation()))) {
+                event.setCancelled(true);
+                return;
+            }
+        } else {
+
+            // for whatever reason, plugin-caused explosions with a null entity count as block explosions and aren't
+            // handled anywhere else
+            if (type == DamageCause.BLOCK_EXPLOSION
+                    && (wcfg.blockOtherExplosions
+                            || !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, defender.getLocation()))) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+
+        if (event.getDamager() instanceof Projectile) {
+            onEntityDamageByProjectile(event);
+            return;
+        }
+
+        Entity attacker = event.getDamager();
+        Entity defender = event.getEntity();
+
+        if (attacker instanceof Player) {
+            Player player = (Player) attacker;
+
+            ConfigurationManager cfg = plugin.getGlobalStateManager();
+            WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+            ItemStack held = player.getInventory().getItemInHand();
+
+            if (held != null) {
+                if (wcfg.getBlacklist() != null) {
+                    if (!wcfg.getBlacklist().check(
+                            new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                                    toVector(player.getLocation()), held.getTypeId()), false, false)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        }
+
+        if (defender instanceof Player) {
+            Player player = (Player) defender;
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            ConfigurationManager cfg = plugin.getGlobalStateManager();
+            WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+            if (isInvincible(player)) {
+                if (wcfg.regionInvinciblityRemovesMobs
+                        && attacker instanceof LivingEntity && !(attacker instanceof Player)
+                        && !(attacker instanceof Tameable && ((Tameable) attacker).isTamed())) {
+                    attacker.remove();
+                }
+
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableLightningDamage && event.getCause() == DamageCause.LIGHTNING) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableExplosionDamage) {
+                switch (event.getCause()) {
+                    case BLOCK_EXPLOSION:
+                    case ENTITY_EXPLOSION:
+                        event.setCancelled(true);
+                        return;
+                }
+            }
+
+            if (attacker != null) {
+                if (attacker instanceof Player) {
+                    if (wcfg.useRegions) {
+                        Vector pt = toVector(defender.getLocation());
+                        Vector pt2 = toVector(attacker.getLocation());
+                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+
+                        if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) attacker))) {
+                            tryCancelPVPEvent((Player) attacker, player, event, true);
+                        } else if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP ,localPlayer)) {
+                            tryCancelPVPEvent((Player) attacker, player, event, false);
+                        }
+                    }
+                }
+
+                if (attacker instanceof TNTPrimed || attacker.getType() == tntMinecartType) {
+
+                    // The check for explosion damage should be handled already... But... What ever...
+                    if (wcfg.blockTNTExplosions) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                    if (wcfg.useRegions) {
+                        Vector pt = toVector(defender.getLocation());
+                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+                        if (!set.allows(DefaultFlag.TNT, localPlayer)) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    }
+                }
+
+                if (attacker instanceof Fireball) {
+                    if (attacker instanceof WitherSkull) {
+                        if (wcfg.blockWitherSkullExplosions) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    } else {
+                        if (wcfg.blockFireballExplosions) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    }
+                    if (wcfg.useRegions) {
+                        Fireball fireball = (Fireball) attacker;
+                        Vector pt = toVector(defender.getLocation());
+                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+                        if (fireball.getShooter() instanceof Player) {
+                            Vector pt2 = toVector(fireball.getShooter().getLocation());
+                            if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) fireball.getShooter()))) {
+                                tryCancelPVPEvent((Player) fireball.getShooter(), player, event, true);
+                            } else if (!set.allows(DefaultFlag.PVP, localPlayer)) {
+                                tryCancelPVPEvent((Player) fireball.getShooter(), player, event, false);
+                            }
+                        } else {
+                            if (!set.allows(DefaultFlag.GHAST_FIREBALL, localPlayer)) {
+                                event.setCancelled(true);
+                                return;
+                            }
+                        }
+
+                    }
+                }
+
+                if (attacker instanceof LivingEntity && !(attacker instanceof Player)) {
+                    if (attacker instanceof Creeper && wcfg.blockCreeperExplosions) {
+                        event.setCancelled(true);
+                        return;
+                    }
+
+                    if (wcfg.disableMobDamage) {
+                        event.setCancelled(true);
+                        return;
+                    }
+
+                    if (wcfg.useRegions) {
+                        Vector pt = toVector(defender.getLocation());
+                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+                        if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer) && !(attacker instanceof Tameable)) {
+                            event.setCancelled(true);
+                            return;
+                        }
+
+                        if (attacker instanceof Creeper) {
+                            if (!set.allows(DefaultFlag.CREEPER_EXPLOSION, localPlayer)) {
+                                event.setCancelled(true);
+                                return;
+                            }
+                        }
+                        if (attacker instanceof Tameable) {
+                            if (((Tameable) attacker).getOwner() == null) {
+                                if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
+                                    event.setCancelled(true);
+                                    return;
+                                }
+                            }
+                            if (!(((Tameable) attacker).getOwner() instanceof Player)) {
+                                return;
+                            }
+                            Player beastMaster = (Player) ((Tameable) attacker).getOwner();
+                            Vector pt2 = toVector(attacker.getLocation());
+                            if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer(beastMaster))) {
+                                tryCancelPVPEvent(beastMaster, player, event, true);
+                            } else if (!set.allows(DefaultFlag.PVP, localPlayer)) {
+                                tryCancelPVPEvent(beastMaster, player, event, false);
+                            }
+                        }
+                    }
+
+                }
+            }
+        }
+    }
+
+    private void onEntityDamageByProjectile(EntityDamageByEntityEvent event) {
+        Entity defender = event.getEntity();
+        Entity attacker = ((Projectile) event.getDamager()).getShooter();
+
+        if (defender instanceof Player) {
+            Player player = (Player) defender;
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            ConfigurationManager cfg = plugin.getGlobalStateManager();
+            WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+            // Check Invincible
+            if (isInvincible(player)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            // Check Mob
+            if (attacker != null && attacker instanceof LivingEntity && !(attacker instanceof Player)) {
+                if (wcfg.disableMobDamage) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+
+                    if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+
+            // Check Player
+            // if (event.getDamager() instanceof EnderPearl || event.getDamager() instanceof Snowball) return;
+            if (attacker != null && attacker instanceof Player) {
+                if (event.getDamager() instanceof EnderPearl && attacker == player) return;
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    Vector pt2 = toVector(attacker.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+
+                    if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) attacker))) {
+                        tryCancelPVPEvent((Player) attacker, player, event, true);
+                    } else if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP, localPlayer)) {
+                        tryCancelPVPEvent((Player) attacker, player, event, false);
+                    }
+                }
+            }
+        }
+
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityDamage(EntityDamageEvent event) {
+
+        if (event instanceof EntityDamageByEntityEvent) {
+            this.onEntityDamageByEntity((EntityDamageByEntityEvent) event);
+            return;
+        } else if (event instanceof EntityDamageByBlockEvent) {
+            this.onEntityDamageByBlock((EntityDamageByBlockEvent) event);
+            return;
+        }
+
+        Entity defender = event.getEntity();
+        DamageCause type = event.getCause();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(defender.getWorld());
+
+        if (defender instanceof Wolf && ((Wolf) defender).isTamed()) {
+            if (wcfg.antiWolfDumbness) {
+                event.setCancelled(true);
+                return;
+            }
+        } else if (defender instanceof Player) {
+            Player player = (Player) defender;
+
+            if (isInvincible(player)) {
+                event.setCancelled(true);
+                player.setFireTicks(0);
+                return;
+            }
+
+            if (type == DamageCause.WITHER) {
+                // wither boss DoT tick
+                if (wcfg.disableMobDamage) {
+                    event.setCancelled(true);
+                    return;
+                }
+
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+                    if (!set.allows(DefaultFlag.MOB_DAMAGE, plugin.wrapPlayer(player))) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+
+            if (type == DamageCause.DROWNING && cfg.hasAmphibiousMode(player)) {
+                player.setRemainingAir(player.getMaximumAir());
+                event.setCancelled(true);
+                return;
+            }
+
+            ItemStack helmet = player.getInventory().getHelmet();
+
+            if (type == DamageCause.DROWNING && wcfg.pumpkinScuba
+                    && helmet != null
+                    && (helmet.getTypeId() == BlockID.PUMPKIN
+                    || helmet.getTypeId() == BlockID.JACKOLANTERN)) {
+                player.setRemainingAir(player.getMaximumAir());
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableFallDamage && type == DamageCause.FALL) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableFireDamage && (type == DamageCause.FIRE
+                    || type == DamageCause.FIRE_TICK)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableDrowningDamage && type == DamageCause.DROWNING) {
+                player.setRemainingAir(player.getMaximumAir());
+                event.setCancelled(true);
+                return;
+            }
+
+           if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
+                BukkitUtil.findFreePosition(player);
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableSuffocationDamage && type == DamageCause.SUFFOCATION) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityCombust(EntityCombustEvent event) {
+        Entity entity = event.getEntity();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (entity instanceof Player) {
+            Player player = (Player) entity;
+
+            if (cfg.hasGodMode(player) || (wcfg.useRegions && RegionQueryUtil.isInvincible(plugin, player))) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called on entity explode.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityExplode(EntityExplodeEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        Location l = event.getLocation();
+        World world = l.getWorld();
+        WorldConfiguration wcfg = cfg.get(world);
+        Entity ent = event.getEntity();
+
+        if (cfg.activityHaltToggle) {
+            if (ent != null) {
+                ent.remove();
+            }
+            event.setCancelled(true);
+            return;
+        }
+
+        if (ent instanceof Creeper) {
+            if (wcfg.blockCreeperExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.blockCreeperBlockDamage) {
+                event.blockList().clear();
+                return;
+            }
+
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.CREEPER_EXPLOSION)) {
+                        event.blockList().clear();
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof EnderDragon) {
+            if (wcfg.blockEnderDragonBlockDamage) {
+                event.blockList().clear();
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.ENDERDRAGON_BLOCK_DAMAGE)) {
+                        event.blockList().clear();
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof TNTPrimed || (ent != null && ent.getType() == tntMinecartType)) {
+            if (wcfg.blockTNTExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.blockTNTBlockDamage) {
+                event.blockList().clear();
+                return;
+            }
+
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.TNT)) {
+                        event.blockList().clear();
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof Fireball) {
+            if (ent instanceof WitherSkull) {
+                if (wcfg.blockWitherSkullExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.blockWitherSkullBlockDamage) {
+                    event.blockList().clear();
+                    return;
+                }
+            } else {
+                if (wcfg.blockFireballExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.blockFireballBlockDamage) {
+                    event.blockList().clear();
+                    return;
+                }
+            }
+            // allow wither skull blocking since there is no dedicated flag atm
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.GHAST_FIREBALL)) {
+                        event.blockList().clear();
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof Wither) {
+            if (wcfg.blockWitherExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.blockWitherBlockDamage) {
+                event.blockList().clear();
+                return;
+            }
+        } else {
+            // unhandled entity
+            if (wcfg.blockOtherExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.OTHER_EXPLOSION)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        }
+
+
+        if (wcfg.signChestProtection) {
+            for (Block block : event.blockList()) {
+                if (wcfg.isChestProtected(block)) {
+                    event.blockList().clear();
+                    return;
+                }
+            }
+        }
+
+    }
+
+    /*
+     * Called on explosion prime
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onExplosionPrime(ExplosionPrimeEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
+        Entity ent = event.getEntity();
+
+        if (cfg.activityHaltToggle) {
+            ent.remove();
+            event.setCancelled(true);
+            return;
+        }
+
+        if (event.getEntityType() == EntityType.WITHER) {
+            if (wcfg.blockWitherExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        } else if (event.getEntityType() == EntityType.WITHER_SKULL) {
+            if (wcfg.blockWitherSkullExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        } else if (event.getEntityType() == EntityType.FIREBALL) {
+            if (wcfg.blockFireballExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        } else if (event.getEntityType() == EntityType.CREEPER) {
+            if (wcfg.blockCreeperExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        } else if (event.getEntityType() == EntityType.PRIMED_TNT
+                || event.getEntityType() == tntMinecartType) {
+            if (wcfg.blockTNTExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onCreatureSpawn(CreatureSpawnEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
+
+        // allow spawning of creatures from plugins
+        if (!wcfg.blockPluginSpawning && event.getSpawnReason() == CreatureSpawnEvent.SpawnReason.CUSTOM)
+            return;
+
+        EntityType entityType = event.getEntityType();
+
+        if (wcfg.blockCreatureSpawn.contains(entityType)) {
+            event.setCancelled(true);
+            return;
+        }
+
+        Location eventLoc = event.getLocation();
+
+        if (wcfg.useRegions && cfg.useRegionsCreatureSpawnEvent) {
+            Vector pt = toVector(eventLoc);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(eventLoc.getWorld());
+            // @TODO get victims' stacktraces and find out why it's null anyway
+            if (mgr == null) return;
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+            if (!set.allows(DefaultFlag.MOB_SPAWNING)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            Set<EntityType> entityTypes = set.getFlag(DefaultFlag.DENY_SPAWN);
+            if (entityTypes != null && entityTypes.contains(entityType)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.blockGroundSlimes && entityType == EntityType.SLIME
+                && eventLoc.getY() >= 60
+                && event.getSpawnReason() == SpawnReason.NATURAL) {
+            event.setCancelled(true);
+            return;
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onCreatePortal(EntityCreatePortalEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
+
+        switch (event.getEntityType()) {
+            case ENDER_DRAGON:
+                if (wcfg.blockEnderDragonPortalCreation) event.setCancelled(true);
+                break;
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPigZap(PigZapEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
+
+        if (wcfg.disablePigZap) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onCreeperPower(CreeperPowerEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
+
+        if (wcfg.disableCreeperPower) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityRegainHealth(EntityRegainHealthEvent event) {
+
+        Entity ent = event.getEntity();
+        World world = ent.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.disableHealthRegain) {
+            event.setCancelled(true);
+            return;
+        }
+    }
+
+    /**
+     * Called when an entity changes a block somehow
+     *
+     * @param event Relevant event details
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityChangeBlock(EntityChangeBlockEvent event) {
+        Entity ent = event.getEntity();
+        Block block = event.getBlock();
+        Location location = block.getLocation();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(ent.getWorld());
+        if (ent instanceof Enderman) {
+            if (wcfg.disableEndermanGriefing) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions) {
+                if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        } else if (ent.getType() == EntityType.WITHER) {
+            if (wcfg.blockWitherBlockDamage || wcfg.blockWitherExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        } else if (/*ent instanceof Zombie && */event instanceof EntityBreakDoorEvent) {
+            if (wcfg.blockZombieDoorDestruction) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onFoodLevelChange(FoodLevelChangeEvent event) {
+        if (event.getEntity() instanceof Player) {
+            Player player = (Player) event.getEntity();
+            if (event.getFoodLevel() < player.getFoodLevel() && isInvincible(player)) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    public void onPotionSplash(PotionSplashEvent event) {
+        Entity entity = event.getEntity();
+        ThrownPotion potion = event.getPotion();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (wcfg.blockPotionsAlways && wcfg.blockPotions.size() > 0) {
+            boolean blocked = false;
+
+            for (PotionEffect effect : potion.getEffects()) {
+                if (wcfg.blockPotions.contains(effect.getType())) {
+                    blocked = true;
+                    break;
+                }
+            }
+
+            if (blocked) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        GlobalRegionManager regionMan = plugin.getGlobalRegionManager();
+
+        int blockedEntities = 0;
+        for (LivingEntity e : event.getAffectedEntities()) {
+            if (!regionMan.allows(DefaultFlag.POTION_SPLASH, e.getLocation(),
+                    e instanceof Player ? plugin.wrapPlayer((Player) e) : null)) {
+                event.setIntensity(e, 0);
+                ++blockedEntities;
+            }
+        }
+
+        if (blockedEntities == event.getAffectedEntities().size()) {
+            event.setCancelled(true);
+        }
+    }
+
+    /**
+     * Check if a player is invincible, via either god mode or region flag. If
+     * the region denies invincibility, the player must have an extra permission
+     * to override it. (worldguard.god.override-regions)
+     *
+     * @param player The player to check
+     * @return Whether {@code player} is invincible
+     */
+    private boolean isInvincible(Player player) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+        boolean god = cfg.hasGodMode(player);
+        if (wcfg.useRegions) {
+            Boolean flag = RegionQueryUtil.isAllowedInvinciblity(plugin, player);
+            boolean allowed = flag == null || flag;
+            boolean invincible = RegionQueryUtil.isInvincible(plugin, player);
+
+            if (allowed) {
+                return god || invincible;
+            } else {
+                return (god && plugin.hasPermission(player, "worldguard.god.override-regions"))
+                    || invincible;
+            }
+        } else {
+            return god;
+        }
+    }
+
+    /**
+     * Using a DisallowedPVPEvent, notifies other plugins that WorldGuard
+     * wants to cancel a PvP damage event.<br />
+     * If this event is not cancelled, the attacking player is notified that
+     * PvP is disabled and WorldGuard cancels the damage event.
+     *
+     * @param attackingPlayer The attacker
+     * @param defendingPlayer The defender
+     * @param event The event that caused WorldGuard to act
+     */
+    public void tryCancelPVPEvent(final Player attackingPlayer, final Player defendingPlayer, EntityDamageByEntityEvent event, boolean aggressorTriggered) {
+        final DisallowedPVPEvent disallowedPVPEvent = new DisallowedPVPEvent(attackingPlayer, defendingPlayer, event);
+        plugin.getServer().getPluginManager().callEvent(disallowedPVPEvent);
+        if (!disallowedPVPEvent.isCancelled()) {
+            if (aggressorTriggered) attackingPlayer.sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
+            else attackingPlayer.sendMessage(ChatColor.DARK_RED + "That player is in a no-PvP area.");
+            event.setCancelled(true);
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardHangingListener.java

@@ -0,0 +1,211 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Hanging;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.Painting;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.hanging.HangingBreakByEntityEvent;
+import org.bukkit.event.hanging.HangingBreakEvent;
+import org.bukkit.event.hanging.HangingBreakEvent.RemoveCause;
+import org.bukkit.event.hanging.HangingPlaceEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+import com.sk89q.worldedit.blocks.ItemID;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+
+/**
+ * Listener for painting related events.
+ *
+ * @author BangL <henno.rickowski@gmail.com>
+ */
+public class WorldGuardHangingListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardHangingListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onHangingingBreak(HangingBreakEvent event) {
+        Hanging hanging = event.getEntity();
+        World world = hanging.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (event instanceof HangingBreakByEntityEvent) {
+            HangingBreakByEntityEvent entityEvent = (HangingBreakByEntityEvent) event;
+            Entity removerEntity = entityEvent.getRemover();
+            if (removerEntity instanceof Projectile) {
+                Projectile projectile = (Projectile) removerEntity; 
+                removerEntity = projectile.getShooter() != null ? projectile.getShooter() : removerEntity; 
+            }
+
+            if (removerEntity instanceof Player) {
+                Player player = (Player) removerEntity;
+
+                if (wcfg.getBlacklist() != null) {
+                    if (hanging instanceof Painting
+                            && !wcfg.getBlacklist().check(
+                                new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                                        toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                        event.setCancelled(true);
+                        return;
+                    } else if (hanging instanceof ItemFrame
+                            && !wcfg.getBlacklist().check(
+                                new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                                        toVector(player.getLocation()), ItemID.ITEM_FRAME), false, false)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+
+                if (wcfg.useRegions) {
+                    if (!plugin.getGlobalRegionManager().canBuild(player, hanging.getLocation())) {
+                        player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            } else {
+                if (removerEntity instanceof Creeper) {
+                    if (wcfg.blockCreeperBlockDamage || wcfg.blockCreeperExplosions) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                    if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(DefaultFlag.CREEPER_EXPLOSION, hanging.getLocation())) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+
+                if (hanging instanceof Painting
+                        && (wcfg.blockEntityPaintingDestroy
+                        || (wcfg.useRegions
+                        && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_PAINTING_DESTROY, hanging.getLocation())))) {
+                    event.setCancelled(true);
+                } else if (hanging instanceof ItemFrame
+                        && (wcfg.blockEntityItemFrameDestroy
+                        || (wcfg.useRegions
+                        && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_ITEM_FRAME_DESTROY, hanging.getLocation())))) {
+                    event.setCancelled(true);
+                }
+            }
+        } else {
+            // Explosions from mobs are not covered by HangingBreakByEntity
+            if (hanging instanceof Painting && wcfg.blockEntityPaintingDestroy
+                    && event.getCause() == RemoveCause.EXPLOSION) {
+                event.setCancelled(true);
+            } else if (hanging instanceof ItemFrame && wcfg.blockEntityItemFrameDestroy
+                    && event.getCause() == RemoveCause.EXPLOSION) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onHangingPlace(HangingPlaceEvent event) {
+        Block placedOn = event.getBlock();
+        Player player = event.getPlayer();
+        World world = placedOn.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.getBlacklist() != null) {
+
+            if (event.getEntity() instanceof Painting
+                    && !wcfg.getBlacklist().check(
+                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                                toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                event.setCancelled(true);
+                return;
+            } else if (event.getEntity() instanceof ItemFrame
+                    && !wcfg.getBlacklist().check(
+                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                                toVector(player.getLocation()), ItemID.ITEM_FRAME), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getRelative(event.getBlockFace()))) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityInteract(PlayerInteractEntityEvent event) {
+        Player player = event.getPlayer();
+        Entity entity = event.getRightClicked();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (wcfg.useRegions && (entity instanceof ItemFrame || entity instanceof Painting)) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, entity.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+
+//            if (entity instanceof ItemFrame
+//                    && ((!plugin.getGlobalRegionManager().allows(
+//                            DefaultFlag.ENTITY_ITEM_FRAME_DESTROY, entity.getLocation())))) {
+//                event.setCancelled(true);
+//            } else if (entity instanceof Painting
+//                    && ((!plugin.getGlobalRegionManager().allows(
+//                            DefaultFlag.ENTITY_PAINTING_DESTROY, entity.getLocation())))) {
+//                event.setCancelled(true);
+//            }
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPaintingListener.java

@@ -0,0 +1,174 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Warning;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Painting;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.painting.PaintingBreakByEntityEvent;
+import org.bukkit.event.painting.PaintingBreakEvent;
+import org.bukkit.event.painting.PaintingPlaceEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+import com.sk89q.worldedit.blocks.ItemID;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+
+/**
+ * Listener for painting related events.
+ *
+ * @author sk89q
+ * @deprecated Use {@link com.sk89q.worldguard.bukkit.WorldGuardHangingListener} instead.
+ */
+@Deprecated
+@Warning(reason="This listener has been replaced by WorldGuardHangingListener")
+public class WorldGuardPaintingListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardPaintingListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPaintingBreak(PaintingBreakEvent breakEvent) {
+        if (!(breakEvent instanceof PaintingBreakByEntityEvent)) {
+            return;
+        }
+
+        PaintingBreakByEntityEvent event = (PaintingBreakByEntityEvent) breakEvent;
+        Painting painting = event.getPainting();
+        World world = painting.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (event.getRemover() instanceof Player) {
+            Player player = (Player) event.getRemover();
+
+            if (wcfg.getBlacklist() != null) {
+                if (!wcfg.getBlacklist().check(
+                            new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                                    toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (wcfg.useRegions) {
+                if (!plugin.getGlobalRegionManager().canBuild(player, painting.getLocation())) {
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        } else {
+            if (event.getRemover() instanceof Creeper) {
+                if (wcfg.blockCreeperBlockDamage || wcfg.blockCreeperExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(DefaultFlag.CREEPER_EXPLOSION, painting.getLocation())) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (wcfg.blockEntityPaintingDestroy
+                    || (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_PAINTING_DESTROY, painting.getLocation()))) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPaintingPlace(PaintingPlaceEvent event) {
+        Block placedOn = event.getBlock();
+        Player player = event.getPlayer();
+        World world = placedOn.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.getBlacklist() != null) {
+
+            if (!wcfg.getBlacklist().check(
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityInteract(PlayerInteractEntityEvent event) {
+        Player player = event.getPlayer();
+        Entity entity = event.getRightClicked();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (wcfg.useRegions && entity instanceof Painting) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, entity.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (entity instanceof Painting
+                    && ((!plugin.getGlobalRegionManager().allows(
+                            DefaultFlag.ENTITY_PAINTING_DESTROY, entity.getLocation())))) {
+                event.setCancelled(true);
+            }
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardServerListener.java

@@ -0,0 +1,38 @@
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.event.server.PluginEnableEvent;
+import org.bukkit.plugin.PluginManager;
+
+/**
+ * @author zml2008
+ */
+public class WorldGuardServerListener implements Listener {
+
+    private final WorldGuardPlugin plugin;
+
+    public WorldGuardServerListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    public void registerEvents() {
+        PluginManager pm = plugin.getServer().getPluginManager();
+        pm.registerEvents(this, plugin);
+    }
+
+    @EventHandler
+    public void onPluginEnable(PluginEnableEvent event) {
+        if (event.getPlugin().getDescription().getName().equalsIgnoreCase("CommandBook")) {
+            plugin.getGlobalStateManager().updateCommandBookGodMode();
+        }
+    }
+
+    @EventHandler
+    public void onPluginDisable(PluginDisableEvent event) {
+        if (event.getPlugin().getDescription().getName().equalsIgnoreCase("CommandBook")) {
+            plugin.getGlobalStateManager().updateCommandBookGodMode();
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardVehicleListener.java

@@ -0,0 +1,98 @@
+// $Id$
+/*
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ * All rights reserved.
+*/
+package com.sk89q.worldguard.bukkit;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.vehicle.VehicleDestroyEvent;
+import org.bukkit.event.vehicle.VehicleMoveEvent;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.bukkit.FlagStateManager.PlayerFlagState;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+public class WorldGuardVehicleListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin
+     */
+    public WorldGuardVehicleListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler
+    public void onVehicleDestroy(VehicleDestroyEvent event) {
+        Vehicle vehicle = event.getVehicle();
+        Entity destroyer = event.getAttacker();
+
+        if (!(destroyer instanceof Player)) return; // don't care
+        Player player = (Player) destroyer;
+        World world = vehicle.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.useRegions) {
+            Vector pt = toVector(vehicle.getLocation());
+            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                    && !set.canBuild(localPlayer)
+                    && !set.allows(DefaultFlag.DESTROY_VEHICLE, localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission to destroy vehicles here.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler
+    public void onVehicleMove(VehicleMoveEvent event) {
+        Vehicle vehicle = event.getVehicle();
+        if (vehicle.getPassenger() == null
+                || !(vehicle.getPassenger() instanceof Player)) return;
+        Player player = (Player) vehicle.getPassenger();
+        World world = vehicle.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.useRegions) {
+            // Did we move a block?
+            if (event.getFrom().getBlockX() != event.getTo().getBlockX()
+                    || event.getFrom().getBlockY() != event.getTo().getBlockY()
+                    || event.getFrom().getBlockZ() != event.getTo().getBlockZ()) {
+                boolean result = WorldGuardPlayerListener.checkMove(plugin, player, event.getFrom(), event.getTo());
+                if (result) {
+                    vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
+                    vehicle.teleport(event.getFrom());
+                }
+            }
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java

@@ -0,0 +1,110 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import org.bukkit.Location;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.weather.LightningStrikeEvent;
+import org.bukkit.event.weather.ThunderChangeEvent;
+import org.bukkit.event.weather.WeatherChangeEvent;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+public class WorldGuardWeatherListener implements Listener {
+
+    /**
+     * Plugin.
+     */
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardWeatherListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onWeatherChange(WeatherChangeEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getWorld());
+
+        if (event.toWeatherState()) {
+            if (wcfg.disableWeather) {
+                event.setCancelled(true);
+            }
+        } else {
+            if (!wcfg.disableWeather && wcfg.alwaysRaining) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onThunderChange(ThunderChangeEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getWorld());
+
+        if (event.toThunderState()) {
+            if (wcfg.disableThunder) {
+                event.setCancelled(true);
+            }
+        } else {
+            if (!wcfg.disableWeather && wcfg.alwaysThundering) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onLightningStrike(LightningStrikeEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getWorld());
+
+        if (wcfg.disallowedLightningBlocks.size() > 0) {
+            int targetId = event.getLightning().getLocation().getBlock().getTypeId();
+            if (wcfg.disallowedLightningBlocks.contains(targetId)) {
+                event.setCancelled(true);
+            }
+        }
+
+        Location loc = event.getLightning().getLocation();
+        if (wcfg.useRegions) {
+            Vector pt = toVector(loc);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(loc.getWorld());
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+            if (!set.allows(DefaultFlag.LIGHTNING)) {
+                event.setCancelled(true);
+            }
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWorldListener.java

@@ -0,0 +1,83 @@
+// $Id$
+/*
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ * All rights reserved.
+*/
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.ChunkLoadEvent;
+import org.bukkit.event.world.WorldLoadEvent;
+
+public class WorldGuardWorldListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardWorldListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler
+    public void onChunkLoad(ChunkLoadEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+
+        if (cfg.activityHaltToggle) {
+            int removed = 0;
+
+            for (Entity entity : event.getChunk().getEntities()) {
+                if (BukkitUtil.isIntensiveEntity(entity)) {
+                    entity.remove();
+                    removed++;
+                }
+            }
+
+            if (removed > 50) {
+                plugin.getLogger().info("Halt-Act: " + removed + " entities (>50) auto-removed from "
+                        + event.getChunk().toString());
+            }
+        }
+    }
+
+    @EventHandler
+    public void onWorldLoad(WorldLoadEvent event) {
+        initWorld(event.getWorld());
+    }
+
+    /**
+     * Initialize the settings for the specified world
+     * @see WorldConfiguration#alwaysRaining
+     * @see WorldConfiguration#disableWeather
+     * @see WorldConfiguration#alwaysThundering
+     * @see WorldConfiguration#disableThunder
+     * @param world The specified world
+     */
+    public void initWorld(World world) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+        if (wcfg.alwaysRaining && !wcfg.disableWeather) {
+            world.setStorm(true);
+        } else if (wcfg.disableWeather && !wcfg.alwaysRaining) {
+            world.setStorm(false);
+        }
+        if (wcfg.alwaysThundering && !wcfg.disableThunder) {
+            world.setThundering(true);
+        } else if (wcfg.disableThunder && !wcfg.alwaysThundering) {
+            world.setStorm(false);
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java

@@ -23,23 +23,27 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.bukkit.ConfigurationManager;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldedit.blocks.ItemType;
 
 public class GeneralCommands {
+    private final WorldGuardPlugin plugin;
+
+    public GeneralCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
     
-    @Command(aliases = {"god"},
-            usage = "[player]",
-            desc = "Enable godmode on a player",
-            flags = "", min = 0, max = 1)
-    public static void god(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        ConfigurationManager config = plugin.getGlobalConfiguration();
+    @SuppressWarnings("deprecation")
+    @Command(aliases = {"god"}, usage = "[player]",
+            desc = "Enable godmode on a player", flags = "s", max = 1)
+    public void god(CommandContext args, CommandSender sender) throws CommandException {
+        ConfigurationManager config = plugin.getGlobalStateManager();
         
         Iterable<Player> targets = null;
         boolean included = false;
@@ -81,13 +85,11 @@ public class GeneralCommands {
         }
     }
     
-    @Command(aliases = {"ungod"},
-            usage = "[player]",
-            desc = "Disable godmode on a player",
-            flags = "", min = 0, max = 1)
-    public static void ungod(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        ConfigurationManager config = plugin.getGlobalConfiguration();
+    @SuppressWarnings("deprecation")
+    @Command(aliases = {"ungod"}, usage = "[player]",
+            desc = "Disable godmode on a player", flags = "s", max = 1)
+    public void ungod(CommandContext args, CommandSender sender) throws CommandException {
+        ConfigurationManager config = plugin.getGlobalStateManager();
         
         Iterable<Player> targets = null;
         boolean included = false;
@@ -124,16 +126,12 @@ public class GeneralCommands {
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
         if (!included && args.hasFlag('s')) {
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Players now have god mode.");
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Players no longer have god mode.");
         }
     }
     
-    @Command(aliases = {"heal"},
-            usage = "[player]",
-            desc = "Heal a player",
-            flags = "", min = 0, max = 1)
-    public static void heal(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1)
+    public void heal(CommandContext args,CommandSender sender) throws CommandException {
         
         Iterable<Player> targets = null;
         boolean included = false;
@@ -153,6 +151,7 @@ public class GeneralCommands {
 
         for (Player player : targets) {
             player.setHealth(20);
+            player.setFoodLevel(20);
             
             // Tell the user
             if (player.equals(sender)) {
@@ -174,12 +173,8 @@ public class GeneralCommands {
         }
     }
     
-    @Command(aliases = {"slay"},
-            usage = "[player]",
-            desc = "Slay a player",
-            flags = "", min = 0, max = 1)
-    public static void slay(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1)
+    public void slay(CommandContext args, CommandSender sender) throws CommandException {
         
         Iterable<Player> targets = null;
         boolean included = false;
@@ -202,12 +197,12 @@ public class GeneralCommands {
             
             // Tell the user
             if (player.equals(sender)) {
-                player.sendMessage(ChatColor.YELLOW + "Slayed!");
+                player.sendMessage(ChatColor.YELLOW + "Slain!");
                 
                 // Keep track of this
                 included = true;
             } else {
-                player.sendMessage(ChatColor.YELLOW + "Slayed by "
+                player.sendMessage(ChatColor.YELLOW + "Slain by "
                         + plugin.toName(sender) + ".");
                 
             }
@@ -216,17 +211,13 @@ public class GeneralCommands {
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
         if (!included && args.hasFlag('s')) {
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Players slayed.");
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Players slain.");
         }
     }
     
-    @Command(aliases = {"locate"},
-            usage = "[player]",
-            desc = "Locate a player",
-            flags = "", min = 0, max = 1)
+    @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1)
     @CommandPermissions({"worldguard.locate"})
-    public static void locate(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void locate(CommandContext args, CommandSender sender) throws CommandException {
         
         Player player = plugin.checkPlayer(sender);
         
@@ -242,15 +233,13 @@ public class GeneralCommands {
         }
     }
     
-    @Command(aliases = {"stack"},
-            usage = "",
-            desc = "Stack items",
-            flags = "", min = 0, max = 0)
+    @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0)
     @CommandPermissions({"worldguard.stack"})
-    public static void stack(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void stack(CommandContext args, CommandSender sender) throws CommandException {
         
         Player player = plugin.checkPlayer(sender);
+        boolean ignoreMax = plugin.hasPermission(player, "worldguard.stack.illegitimate");
+        boolean ignoreDamaged = plugin.hasPermission(player, "worldguard.stack.damaged");
         
         ItemStack[] items = player.getInventory().getContents();
         int len = items.length;
@@ -262,17 +251,14 @@ public class GeneralCommands {
 
             // Avoid infinite stacks and stacks with durability
             if (item == null || item.getAmount() <= 0
-                    || ItemType.shouldNotStack(item.getTypeId())) {
+                    || (!ignoreMax && item.getMaxStackSize() == 1)) {
                 continue;
             }
 
-            // Ignore buckets
-            if (item.getTypeId() >= 325 && item.getTypeId() <= 327) {
-                continue;
-            }
+            int max = ignoreMax ? 64 : item.getMaxStackSize();
 
-            if (item.getAmount() < 64) {
-                int needed = 64 - item.getAmount(); // Number of needed items until 64
+            if (item.getAmount() < max) {
+                int needed = max - item.getAmount(); // Number of needed items until max
 
                 // Find another stack of the same type
                 for (int j = i + 1; j < len; j++) {
@@ -280,25 +266,28 @@ public class GeneralCommands {
 
                     // Avoid infinite stacks and stacks with durability
                     if (item2 == null || item2.getAmount() <= 0
-                            || ItemType.shouldNotStack(item.getTypeId())) {
+                            || (!ignoreMax && item.getMaxStackSize() == 1)) {
                         continue;
                     }
 
                     // Same type?
                     // Blocks store their color in the damage value
                     if (item2.getTypeId() == item.getTypeId() &&
-                            (!ItemType.usesDamageValue(item.getTypeId())
-                                    || item.getDurability() == item2.getDurability())) {
+                            ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged)
+                                    || item.getDurability() == item2.getDurability()) &&
+                                    ((item.getItemMeta() == null && item2.getItemMeta() == null)
+                                            || (item.getItemMeta() != null &&
+                                                item.getItemMeta().equals(item2.getItemMeta())))) {
                         // This stack won't fit in the parent stack
                         if (item2.getAmount() > needed) {
-                            item.setAmount(64);
+                            item.setAmount(max);
                             item2.setAmount(item2.getAmount() - needed);
                             break;
                         // This stack will
                         } else {
                             items[j] = null;
                             item.setAmount(item.getAmount() + item2.getAmount());
-                            needed = 64 - item.getAmount();
+                            needed = max - item.getAmount();
                         }
 
                         affected++;

src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java

@@ -20,21 +20,25 @@
 package com.sk89q.worldguard.bukkit.commands;
 
 import org.bukkit.command.CommandSender;
-import com.sk89q.minecraft.util.commands.*;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.NestedCommand;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 public class ProtectionCommands {
-    @Command(aliases = {"region"},
-            desc = "Region management commands")
-    @NestedCommand({RegionCommands.class, RegionMemberCommands.class})
-    public static void region(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @SuppressWarnings("unused")
+    private final WorldGuardPlugin plugin;
+
+    public ProtectionCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
     }
 
-    @Command(aliases = {"worldguard"},
-            desc = "WorldGuard commands")
+    @Command(aliases = {"region", "regions", "rg"}, desc = "Region management commands")
+    @NestedCommand({RegionCommands.class, RegionMemberCommands.class})
+    public void region(CommandContext args, CommandSender sender) {}
+
+    @Command(aliases = {"worldguard", "wg"}, desc = "WorldGuard commands")
     @NestedCommand({WorldGuardCommands.class})
-    public static void worldGuard(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-    }
+    public void worldGuard(CommandContext args, CommandSender sender) {}
 }

src/main/java/com/sk89q/worldguard/bukkit/commands/RegionListEntry.java

@@ -0,0 +1,58 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit.commands;
+
+/**
+ * Used for /rg list.
+ */
+class RegionListEntry implements Comparable<RegionListEntry> {
+    
+    private final String id;
+    private final int index;
+    boolean isOwner;
+    boolean isMember;
+
+    public RegionListEntry(String id, int index) {
+        this.id = id;
+        this.index = index;
+    }
+
+    @Override
+    public int compareTo(RegionListEntry o) {
+        if (isOwner != o.isOwner) {
+            return isOwner ? 1 : -1;
+        }
+        if (isMember != o.isMember) {
+            return isMember ? 1 : -1;
+        }
+        return id.compareTo(o.id);
+    }
+
+    @Override
+    public String toString() {
+        if (isOwner) {
+            return (index + 1) + ". +" + id;
+        } else if (isMember) {
+            return (index + 1) + ". -" + id;
+        } else {
+            return (index + 1) + ". " + id;
+        }
+    }
+    
+}

src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java

@@ -0,0 +1,303 @@
+// $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.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.RegionDBUtil;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+// @TODO: A lot of code duplication here! Need to fix.
+
+public class RegionMemberCommands {
+    private final WorldGuardPlugin plugin;
+
+    public RegionMemberCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"addmember", "addmember"},
+            usage = "<id> <members...>",
+            flags = "w:",
+            desc = "Add a member to a region",
+            min = 2)
+    public void addMember(CommandContext args, CommandSender sender) throws CommandException {
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            if (player != null) {
+                world = player.getWorld();
+            } else {
+                throw new CommandException("No world specified. Use -w <worldname>.");
+            }
+        }
+
+        String id = args.getString(0);
+
+        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+        ProtectedRegion region = mgr.getRegion(id);
+
+        if (region == null) {
+            throw new CommandException("Could not find a region by that ID.");
+        }
+
+        id = region.getId();
+
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addmember.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addmember.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.addmember." + id.toLowerCase());
+            }
+        }
+
+        RegionDBUtil.addToDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
+
+        sender.sendMessage(ChatColor.YELLOW
+                + "Region '" + id + "' updated.");
+
+        try {
+            mgr.save();
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
+                    + e.getMessage());
+        }
+    }
+
+    @Command(aliases = {"addowner", "addowner"},
+            usage = "<id> <owners...>",
+            flags = "w:",
+            desc = "Add an owner to a region",
+            min = 2)
+    public void addOwner(CommandContext args, CommandSender sender) throws CommandException {
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            if (player != null) {
+                world = player.getWorld();
+            } else {
+                throw new CommandException("No world specified. Use -w <worldname>.");
+            }
+        }
+
+        String id = args.getString(0);
+
+        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+        ProtectedRegion region = mgr.getRegion(id);
+
+        if (region == null) {
+            throw new CommandException("Could not find a region by that ID.");
+        }
+
+        id = region.getId();
+
+        Boolean flag = region.getFlag(DefaultFlag.BUYABLE);
+        DefaultDomain owners = region.getOwners();
+        if (localPlayer != null) {
+            if (flag != null && flag && owners != null && owners.size() == 0) {
+                if (!plugin.hasPermission(player, "worldguard.region.unlimited")) {
+                    int maxRegionCount = plugin.getGlobalStateManager().get(world).getMaxRegionCount(player);
+                    if (maxRegionCount >= 0 && mgr.getRegionCountOfPlayer(localPlayer)
+                            >= maxRegionCount) {
+                        throw new CommandException("You already own the maximum allowed amount of regions.");
+                    }
+                }
+                plugin.checkPermission(sender, "worldguard.region.addowner.unclaimed." + id.toLowerCase());
+            } else {
+                if (region.isOwner(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.addowner.own." + id.toLowerCase());
+                } else if (region.isMember(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.addowner.member." + id.toLowerCase());
+                } else {
+                    plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
+                }
+            }
+        }
+
+        RegionDBUtil.addToDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
+
+        sender.sendMessage(ChatColor.YELLOW
+                + "Region '" + id + "' updated.");
+
+        try {
+            mgr.save();
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
+                    + e.getMessage());
+        }
+    }
+
+    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"},
+            usage = "<id> <owners...>",
+            flags = "aw:",
+            desc = "Remove an owner to a region",
+            min = 1)
+    public void removeMember(CommandContext args, CommandSender sender) throws CommandException {
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            if (player != null) {
+                world = player.getWorld();
+            } else {
+                throw new CommandException("No world specified. Use -w <worldname>.");
+            }
+        }
+
+        String id = args.getString(0);
+
+        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+        ProtectedRegion region = mgr.getRegion(id);
+
+        if (region == null) {
+            throw new CommandException("Could not find a region by that ID.");
+        }
+
+        id = region.getId();
+
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removemember.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removemember.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.removemember." + id.toLowerCase());
+            }
+        }
+
+        if (args.hasFlag('a')) {
+            region.getMembers().removaAll();
+        } else {
+            if (args.argsLength() < 2) {
+                throw new CommandException("List some names to remove, or use -a to remove all.");
+            }
+            RegionDBUtil.removeFromDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
+        }
+
+        sender.sendMessage(ChatColor.YELLOW
+                + "Region '" + id + "' updated.");
+
+        try {
+            mgr.save();
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
+                    + e.getMessage());
+        }
+    }
+
+    @Command(aliases = {"removeowner", "remowner"},
+            usage = "<id> <owners...>",
+            flags = "aw:",
+            desc = "Remove an owner to a region",
+            min = 1)
+    public void removeOwner(CommandContext args,
+            CommandSender sender) throws CommandException {
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            if (player != null) {
+                world = player.getWorld();
+            } else {
+                throw new CommandException("No world specified. Use -w <worldname>.");
+            }
+        }
+
+        String id = args.getString(0);
+
+        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+        ProtectedRegion region = mgr.getRegion(id);
+
+        if (region == null) {
+            throw new CommandException("Could not find a region by that ID.");
+        }
+
+        id = region.getId();
+
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removeowner.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removeowner.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.removeowner." + id.toLowerCase());
+            }
+        }
+
+        if (args.hasFlag('a')) {
+            region.getOwners().removaAll();
+        } else {
+            if (args.argsLength() < 2) {
+                throw new CommandException("List some names to remove, or use -a to remove all.");
+            }
+            RegionDBUtil.removeFromDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
+        }
+
+        sender.sendMessage(ChatColor.YELLOW
+                + "Region '" + id + "' updated.");
+
+        try {
+            mgr.save();
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
+                    + e.getMessage());
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/commands/RegionPrintoutBuilder.java

@@ -0,0 +1,334 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+/**
+ * Create a region printout, as used in /region info to show information about
+ * a region.
+ */
+public class RegionPrintoutBuilder {
+    
+    private final ProtectedRegion region;
+    private final StringBuilder builder = new StringBuilder();
+
+    /**
+     * Create a new instance with a region to report on.
+     * 
+     * @param region the region
+     */
+    public RegionPrintoutBuilder(ProtectedRegion region) {
+        this.region = region;
+    }
+
+    /**
+     * Add a new line.
+     */
+    private void newLine() {
+        builder.append("\n");
+    }
+    
+    /**
+     * Add region name, type, and priority.
+     */
+    public void appendBasics() {
+        builder.append(ChatColor.BLUE);
+        builder.append("Region: ");
+        builder.append(ChatColor.YELLOW);
+        builder.append(region.getId());
+        
+        builder.append(ChatColor.GRAY);
+        builder.append(" (type=");
+        builder.append(region.getTypeName());
+        
+        builder.append(ChatColor.GRAY);
+        builder.append(", priority=");
+        builder.append(region.getPriority());
+        builder.append(")");
+
+        newLine();
+    }
+    
+    /**
+     * Add information about flags.
+     */
+    public void appendFlags() {
+        builder.append(ChatColor.BLUE);
+        builder.append("Flags: ");
+        
+        appendFlagsList(true);
+        
+        newLine();
+    }
+    
+    /**
+     * Append just the list of flags (without "Flags:"), including colors.
+     *
+     * @param useColors true to use colors
+     */
+    public void appendFlagsList(boolean useColors) {
+        boolean hasFlags = false;
+        
+        for (Flag<?> flag : DefaultFlag.getFlags()) {
+            Object val = region.getFlag(flag), group = null;
+            
+            // No value
+            if (val == null) {
+                continue;
+            }
+
+            if (hasFlags) {
+                builder.append(", ");
+            } else {
+                if (useColors) {
+                    builder.append(ChatColor.YELLOW);
+                }
+            }
+
+            RegionGroupFlag groupFlag = flag.getRegionGroupFlag();
+            if (groupFlag != null) {
+                group = region.getFlag(groupFlag);
+            }
+
+            if(group == null) {
+                builder.append(flag.getName()).append(": ")
+                    .append(String.valueOf(val));
+            } else {
+                builder.append(flag.getName()).append(" -g ")
+                    .append(String.valueOf(group)).append(": ")
+                    .append(String.valueOf(val));
+            }
+
+            hasFlags = true;
+        }
+            
+        if (!hasFlags) {
+            if (useColors) {
+                builder.append(ChatColor.RED);
+            }
+            builder.append("(none)");
+        }
+    }
+    
+    /**
+     * Add information about parents.
+     */
+    public void appendParents() {
+        appendParentTree(true);
+    }
+    
+    /**
+     * Add information about parents.
+     * 
+     * @param useColors true to use colors
+     */
+    public void appendParentTree(boolean useColors) {
+        if (region.getParent() == null) {
+            return;
+        }
+        
+        List<ProtectedRegion> inheritance = new ArrayList<ProtectedRegion>();
+
+        ProtectedRegion r = region;
+        inheritance.add(r);
+        while (r.getParent() != null) {
+            r = r.getParent();
+            inheritance.add(r);
+        }
+
+        ListIterator<ProtectedRegion> it = inheritance.listIterator(
+                inheritance.size());
+
+        int indent = 0;
+        while (it.hasPrevious()) {
+            ProtectedRegion cur = it.previous();
+            if (useColors) {
+                builder.append(ChatColor.GREEN);
+            }
+            
+            // Put symbol for child
+            if (indent != 0) {
+                for (int i = 0; i < indent; i++) {
+                    builder.append("  ");
+                }
+                builder.append("\u2517");
+            }
+            
+            // Put name
+            builder.append(cur.getId());
+            
+            // Put (parent)
+            if (!cur.equals(region)) {
+                if (useColors) {
+                    builder.append(ChatColor.GRAY);
+                }
+                builder.append(" (parent, priority=" + cur.getPriority() + ")");
+            }
+            
+            indent++;
+            newLine();
+        }
+    }
+    
+    /**
+     * Add information about members.
+     */
+    public void appendDomain() {
+        builder.append(ChatColor.BLUE);
+        builder.append("Owners: ");
+        DefaultDomain owners = region.getOwners();
+        if (owners.size() != 0) {
+            builder.append(ChatColor.YELLOW);
+            builder.append(owners.toUserFriendlyString());
+        } else {
+            builder.append(ChatColor.RED);
+            builder.append("(no owners)");
+        }
+
+        newLine();
+
+        builder.append(ChatColor.BLUE);
+        builder.append("Members: ");
+        DefaultDomain members = region.getMembers();
+        if (members.size() != 0) {
+            builder.append(ChatColor.YELLOW);
+            builder.append(members.toUserFriendlyString());
+        } else {
+            builder.append(ChatColor.RED);
+            builder.append("(no members)");
+        }
+        
+        newLine();
+    }
+    
+    /**
+     * Add information about coordinates.
+     */
+    public void appendBounds() {
+        BlockVector min = region.getMinimumPoint();
+        BlockVector max = region.getMaximumPoint();
+        builder.append(ChatColor.BLUE);
+        builder.append("Bounds:");
+        builder.append(ChatColor.YELLOW);
+        builder.append(" (" + min.getBlockX() + "," + min.getBlockY() + "," + min.getBlockZ() + ")");
+        builder.append(" -> (" + max.getBlockX() + "," + max.getBlockY() + "," + max.getBlockZ() + ")");
+        
+        newLine();
+    }
+    
+    /**
+     * Append all the default fields used for /rg info.
+     */
+    public void appendRegionInfo() {
+        builder.append(ChatColor.GRAY);
+        builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
+        builder.append(" Region Info ");
+        builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
+        newLine();
+        appendBasics();
+        appendFlags();
+        appendParents();
+        appendDomain();
+        appendBounds();
+    }
+    
+    /**
+     * Send the report to a {@link CommandSender}.
+     * 
+     * @param sender the recepient
+     */
+    public void send(CommandSender sender) {
+        sender.sendMessage(toString());
+    }
+    
+    public StringBuilder append(boolean b) {
+        return builder.append(b);
+    }
+
+    public StringBuilder append(char c) {
+        return builder.append(c);
+    }
+
+    public StringBuilder append(char[] str, int offset, int len) {
+        return builder.append(str, offset, len);
+    }
+
+    public StringBuilder append(char[] str) {
+        return builder.append(str);
+    }
+
+    public StringBuilder append(CharSequence s, int start, int end) {
+        return builder.append(s, start, end);
+    }
+
+    public StringBuilder append(CharSequence s) {
+        return builder.append(s);
+    }
+
+    public StringBuilder append(double d) {
+        return builder.append(d);
+    }
+
+    public StringBuilder append(float f) {
+        return builder.append(f);
+    }
+
+    public StringBuilder append(int i) {
+        return builder.append(i);
+    }
+
+    public StringBuilder append(long lng) {
+        return builder.append(lng);
+    }
+
+    public StringBuilder append(Object obj) {
+        return builder.append(obj);
+    }
+
+    public StringBuilder append(String str) {
+        return builder.append(str);
+    }
+
+    public StringBuilder append(StringBuffer sb) {
+        return builder.append(sb);
+    }
+
+    public StringBuilder appendCodePoint(int codePoint) {
+        return builder.appendCodePoint(codePoint);
+    }
+    
+    @Override
+    public String toString() {
+        return builder.toString().trim();
+    }
+
+}

src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java

@@ -0,0 +1,145 @@
+// $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.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldguard.bukkit.BukkitUtil;
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
+import com.sk89q.worldguard.bukkit.WorldConfiguration;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+
+public class ToggleCommands {
+    private final WorldGuardPlugin plugin;
+
+    public ToggleCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"stopfire"}, usage = "[<world>]",
+            desc = "Disables all fire spread temporarily", max = 1)
+    @CommandPermissions({"worldguard.fire-toggle.stop"})
+    public void stopFire(CommandContext args, CommandSender sender) throws CommandException {
+        
+        World world;
+        
+        if (args.argsLength() == 0) {
+            world = plugin.checkPlayer(sender).getWorld();
+        } else {
+            world = plugin.matchWorld(sender, args.getString(0));
+        }
+        
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world);
+
+        if (!wcfg.fireSpreadDisableToggle) {
+            plugin.getServer().broadcastMessage(
+                    ChatColor.YELLOW
+                    + "Fire spread has been globally disabled for '" + world.getName() + "' by "
+                    + plugin.toName(sender) + ".");
+        } else {
+            sender.sendMessage(
+                    ChatColor.YELLOW
+                    + "Fire spread was already globally disabled.");
+        }
+
+        wcfg.fireSpreadDisableToggle = true;
+    }
+
+    @Command(aliases = {"allowfire"}, usage = "[<world>]",
+            desc = "Allows all fire spread temporarily", max = 1)
+    @CommandPermissions({"worldguard.fire-toggle.stop"})
+    public void allowFire(CommandContext args, CommandSender sender) throws CommandException {
+        
+        World world;
+        
+        if (args.argsLength() == 0) {
+            world = plugin.checkPlayer(sender).getWorld();
+        } else {
+            world = plugin.matchWorld(sender, args.getString(0));
+        }
+        
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world);
+
+        if (wcfg.fireSpreadDisableToggle) {
+            plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                    + "Fire spread has been globally for '" + world.getName() + "' re-enabled by "
+                    + plugin.toName(sender) + ".");
+        } else {
+            sender.sendMessage(ChatColor.YELLOW
+                    + "Fire spread was already globally enabled.");
+        }
+
+        wcfg.fireSpreadDisableToggle = false;
+    }
+
+    @Command(aliases = {"halt-activity", "stoplag", "haltactivity"},
+            desc = "Attempts to cease as much activity in order to stop lag", flags = "c", max = 0)
+    @CommandPermissions({"worldguard.halt-activity"})
+    public void stopLag(CommandContext args, CommandSender sender) throws CommandException {
+
+        ConfigurationManager configManager = plugin.getGlobalStateManager();
+
+        configManager.activityHaltToggle = !args.hasFlag('c');
+
+        if (configManager.activityHaltToggle) {
+            if (!(sender instanceof Player)) {
+                sender.sendMessage(ChatColor.YELLOW
+                        + "ALL intensive server activity halted.");
+            }
+
+            plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                    + "ALL intensive server activity halted by "
+                    + plugin.toName(sender) + ".");
+
+            for (World world : plugin.getServer().getWorlds()) {
+                int removed = 0;
+
+                for (Entity entity : world.getEntities()) {
+                    if (BukkitUtil.isIntensiveEntity(entity)) {
+                        entity.remove();
+                        removed++;
+                    }
+                }
+
+                if (removed > 10) {
+                    sender.sendMessage("" + removed + " entities (>10) auto-removed from "
+                            + world.getName());
+                }
+            }
+
+        } else {
+            if (!(sender instanceof Player)) {
+                sender.sendMessage(ChatColor.YELLOW
+                        + "ALL intensive server activity no longer halted.");
+            }
+
+            plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                    + "ALL intensive server activity is now allowed.");
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java

@@ -23,9 +23,11 @@ import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
@@ -37,26 +39,23 @@ import com.sk89q.worldguard.util.PastebinPoster;
 import com.sk89q.worldguard.util.PastebinPoster.PasteCallback;
 
 public class WorldGuardCommands {
+    private final WorldGuardPlugin plugin;
 
-    @Command(aliases = {"version"},
-            usage = "",
-            desc = "Get the WorldGuard version",
-            flags = "", min = 0, max = 0)
-    public static void version(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public WorldGuardCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"version"}, desc = "Get the WorldGuard version", max = 0)
+    public void version(CommandContext args, CommandSender sender) throws CommandException {
         sender.sendMessage(ChatColor.YELLOW
                 + "WorldGuard " + plugin.getDescription().getVersion());
         sender.sendMessage(ChatColor.YELLOW
                 + "http://www.sk89q.com");
     }
 
-    @Command(aliases = {"reload"},
-            usage = "",
-            desc = "Reload WorldGuard configuration",
-            flags = "", min = 0, max = 0)
+    @Command(aliases = {"reload"}, desc = "Reload WorldGuard configuration", max = 0)
     @CommandPermissions({"worldguard.reload"})
-    public static void relload(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void reload(CommandContext args, CommandSender sender) throws CommandException {
         
         LoggerToChatHandler handler = null;
         Logger minecraftLogger = null;
@@ -69,10 +68,11 @@ public class WorldGuardCommands {
         }
 
         try {
-            plugin.getGlobalConfiguration().unload();
+            plugin.getGlobalStateManager().unload();
             plugin.getGlobalRegionManager().unload();
-            plugin.getGlobalConfiguration().load();
+            plugin.getGlobalStateManager().load();
             plugin.getGlobalRegionManager().preload();
+            // WGBukkit.cleanCache();
             sender.sendMessage("WorldGuard configuration reloaded.");
         } catch (Throwable t) {
             sender.sendMessage("Error while reloading: "
@@ -84,13 +84,9 @@ public class WorldGuardCommands {
         }
     }
     
-    @Command(aliases = {"report"},
-            usage = "",
-            desc = "Writes a report on WorldGuard",
-            flags = "p", min = 0, max = 0)
+    @Command(aliases = {"report"}, desc = "Writes a report on WorldGuard", flags = "p", max = 0)
     @CommandPermissions({"worldguard.report"})
-    public static void report(CommandContext args, WorldGuardPlugin plugin,
-            final CommandSender sender) throws CommandException {
+    public void report(CommandContext args, final CommandSender sender) throws CommandException {
         
         File dest = new File(plugin.getDataFolder(), "report.txt");
         ReportWriter report = new ReportWriter(plugin);
@@ -109,13 +105,11 @@ public class WorldGuardCommands {
             sender.sendMessage(ChatColor.YELLOW + "Now uploading to Pastebin...");
             PastebinPoster.paste(report.toString(), new PasteCallback() {
                 
-                @Override
                 public void handleSuccess(String url) {
                     // Hope we don't have a thread safety issue here
                     sender.sendMessage(ChatColor.YELLOW + "WorldGuard report (1 hour): " + url);
                 }
                 
-                @Override
                 public void handleError(String err) {
                     // Hope we don't have a thread safety issue here
                     sender.sendMessage(ChatColor.YELLOW + "WorldGuard report pastebin error: " + err);
@@ -124,4 +118,21 @@ public class WorldGuardCommands {
         }
 
     }
+
+    @Command(aliases = {"flushstates", "clearstates"},
+            usage = "[player]", desc = "Flush the state manager", max = 1)
+    @CommandPermissions("worldguard.flushstates")
+    public void flushStates(CommandContext args, CommandSender sender) throws CommandException {
+        if (args.argsLength() == 0) {
+            plugin.getFlagStateManager().forgetAll();
+            sender.sendMessage("Cleared all states.");
+        } else {
+            Player player = plugin.getServer().getPlayer(args.getString(0));
+            if (player != null) {
+                plugin.getFlagStateManager().forget(player);
+                sender.sendMessage("Cleared states for player \"" + player.getName() + "\".");
+            }
+        }
+    }
+
 }

src/main/java/com/sk89q/worldguard/chest/ChestProtection.java

@@ -0,0 +1,77 @@
+// $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.chest;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+/**
+ * Interface for chest protection.
+ */
+public interface ChestProtection {
+
+    /**
+     * Returns whether a block is protected.
+     * 
+     * @param block The block to check
+     * @param player The player to check
+     * @return Whether the block is protected for player
+     */
+    public boolean isProtected(Block block, Player player);
+
+    /**
+     * Returns whether a location where a chest block is trying to be created 
+     * is protected. 
+     * 
+     * @param block The block to check
+     * @param player The player to check
+     * @return Whether {@code player} can place a block at the specified block
+     */
+    public boolean isProtectedPlacement(Block block, Player player);
+
+    /**
+     * Returns whether an adjacent chest is protected.
+     * 
+     * @param searchBlock The block to check
+     * @param player The player to check
+     * @return Whether {@code searchBlock} is protected from access by {@code player}
+     */
+    public boolean isAdjacentChestProtected(Block searchBlock, Player player);
+
+    /**
+     * Returns whether a material is a chest.
+     *
+     * @param material The material to check
+     * @deprecated see {@link #isChest(int)}
+     * @return {@link #isChest(int)}
+     */
+    @Deprecated
+    public boolean isChest(Material material);
+
+    /**
+     * Returns whether a material is a chest.
+     *
+     * @param type The type to check
+     * @return Whether type is a 'chest' (block that can be protected)
+     */
+    public boolean isChest(int type);
+
+}

src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java

@@ -17,8 +17,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldguard.bukkit;
+package com.sk89q.worldguard.chest;
 
+import com.sk89q.worldedit.blocks.BlockID;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
@@ -26,17 +27,17 @@ import org.bukkit.block.Sign;
 import org.bukkit.entity.Player;
 
 /**
- * Utility class for sign chest protection.
+ * Sign-based chest protection.
  * 
  * @author sk89q
  */
-public class SignChestProtection {
+public class SignChestProtection implements ChestProtection {
     
     public boolean isProtected(Block block, Player player) {
-        if (isChest(block.getType())) {
+        if (isChest(block.getTypeId())) {
             Block below = block.getRelative(0, -1, 0);
             return isProtectedSignAround(below, player);
-        } else if (block.getType() == Material.SIGN_POST) {
+        } else if (block.getTypeId() == BlockID.SIGN_POST) {
             return isProtectedSignAndChestBinary(block, player);
         } else {
             Block above = block.getRelative(0, 1, 0);
@@ -46,29 +47,33 @@ public class SignChestProtection {
         }
     }
     
+    public boolean isProtectedPlacement(Block block, Player player) {
+        return isProtectedSignAround(block, player);
+    }
+    
     private boolean isProtectedSignAround(Block searchBlock, Player player) {
         Block side;
         Boolean res;
         
         side = searchBlock;
         res = isProtectedSign(side, player);
-        if (res != null) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(-1, 0, 0);
         res = isProtectedSignAndChest(side, player);
-        if (res != null) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(1, 0, 0);
         res = isProtectedSignAndChest(side, player);
-        if (res != null) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(0, 0, -1);
         res = isProtectedSignAndChest(side, player);
-        if (res != null) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(0, 0, 1);
         res = isProtectedSignAndChest(side, player);
-        if (res != null) return res;
+        if (res != null && res) return res;
         
         return false;
     }
@@ -102,7 +107,7 @@ public class SignChestProtection {
     }
     
     private Boolean isProtectedSignAndChest(Block block, Player player) {
-        if (!isChest(block.getRelative(0, 1, 0).getType())) {
+        if (!isChest(block.getRelative(0, 1, 0).getTypeId())) {
             return null;
         }
         return isProtectedSign(block, player);
@@ -110,16 +115,45 @@ public class SignChestProtection {
     
     private boolean isProtectedSignAndChestBinary(Block block, Player player) {
         Boolean res = isProtectedSignAndChest(block, player);
-        if (res == null || res == false) {
-            return false;
-        }
-        return true;
+        return !(res == null || !res);
     }
-    
-    private boolean isChest(Material material) {
-        return material == Material.CHEST
-                || material == Material.DISPENSER
-                || material == Material.FURNACE
-                || material == Material.BURNING_FURNACE;
+
+    public boolean isAdjacentChestProtected(Block searchBlock, Player player) {
+        Block side;
+        Boolean res;
+        
+        side = searchBlock;
+        res = isProtected(side, player);
+        if (res != null && res) return res;
+        
+        side = searchBlock.getRelative(-1, 0, 0);
+        res = isProtected(side, player);
+        if (res != null && res) return res;
+        
+        side = searchBlock.getRelative(1, 0, 0);
+        res = isProtected(side, player);
+        if (res != null && res) return res;
+        
+        side = searchBlock.getRelative(0, 0, -1);
+        res = isProtected(side, player);
+        if (res != null && res) return res;
+        
+        side = searchBlock.getRelative(0, 0, 1);
+        res = isProtected(side, player);
+        if (res != null && res) return res;
+        
+        return false;
+    }
+
+    @Deprecated
+    public boolean isChest(Material material) {
+        return isChest(material.getId());
+    }
+
+    public boolean isChest(int type) {
+        return type == BlockID.CHEST
+                || type == BlockID.DISPENSER
+                || type == BlockID.FURNACE
+                || type == BlockID.BURNING_FURNACE;
     }
 }