Removed code redundancy

- Logic should now be easier to follow
- Less code duplication
- The fire-spread flag, the fire.disable-all-fire-spread and the
  stop/allowfire commands now do the same thing.
- The "High frequency flag" setting is now enforced consistently on all
  parts of the fire-spread flag, not just half of it.

.gitignore

@@ -1,17 +1,13 @@
-/.classpath
-/.project
-/.settings
-/target
+.classpath
+.project
+.settings
+target
 
 .DS_Store
-
-**/*.iml
-**/.idea
+*.iml
+.idea
 
 /bin
 /dependency-reduced-pom.xml
 *-private.sh
 
-/.gradle
-**/build
-

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 jdk:
-  - oraclejdk8
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
 notifications:
-  email: false
-before_install: chmod +x gradlew
-script: ./gradlew build -S
+  email: false

CHANGELOG.md

@@ -1,833 +0,0 @@
-# Changelog
-
-## 6.1.2
-* Added support for new blocks in 1.8, 1.9, and 1.10.
-* Added protection from nether portals being created in protected region (enable via config `nether-portal-protection`).
-* Added protection from slime block piston contraptions pushing into or pulling from regions.
-* Added `chorus-fruit-teleport` flag, works similar to `enderpearl` to prevent teleportation.
-* Added protection from pulling armor stands, items, and entities from protected regions.
-* Changed order of greeting and farewell flags on adjacent regions. When leaving a region with a farewell flag and entering one with a greeting flag, the farewell message will be shown first now.
-* Changed /heal command to also fill food/saturation meters.
-* Changed fall damage prevention to also prevent flying into walls with elytra being fatal.
-* Fixed fire-spread flag only preventing destruction, now prevents spreading too as per its name.
-* Fixed creepers targeting players being able to blow things up in certain cases.
-* Fixed armor stands being removed by /stoplag.
-* Fixed some issues with fireballs being able to explode when ghast-fireball was set to deny.
-* Fixed a lot of other minor issues.
-
-## 6.1
-
-* Added `exit-via-teleport` flag (default allow) to control exiting an exit=deny region via teleportation.
-* Added a `fall-damage` flag to control player damage caused by falling.
-* Added a `time-lock` flag to lock players' time of day. Valid values are from 0 to 24000 for absolute time, or +- any number for relative time.
-* Added a `weather-lock` flag to lock players' weather. Valid values are "clear" or "downfall". Unset to restore to normal world weather.
-* Added `-s` to the event debugging commands to show a stack trace rather than attempt to detect the causing plugin.
-* Added support for using the `-e` argument (sets an empty value for the flag) in the flag set command when the type of flag is of the 'set' type.
-* Added NPCs from the Citizens plugin to a whitelist so they are not protected.
-* Added support for Spigot's BlockExplodeEvent.
-* Changed tripwire to fall under the `use` flag.
-* Changed enderchests to fall under the `use` flag.
-* Changed vehicles and animals so they are not included in the `interact` flag.
-* Changed the display of custom blacklist messages to no longer include a period at the end.
-* Changed protection logic to consider connected chests.
-* Changed the heal and feed flags to increase values for players who are invincible (or in creative mode) but not decrease them.
-* Changed PvP protection to consider both attacker and defender locations.
-* Fixed missing protection data for some 1.8-added blocks.
-* Fixed compatibility issues with MC 1.7.
-* Fixed inverted daylight detectors not being protected.
-* Fixed spawn eggs not being included in protection.
-* Fixed piston blocking not working due to a bug in Spigot.
-* Fixed the blocking of certain invalid entity damage events.
-* Fixed creeper explosions not being blocked in certain situations with explosion related flags set.
-* Fixed "stickiness" with some position-related flags, sometimes resulting in rubber banding in the exit flags.
-* Fixed armor stands so that they are treated more like item frames than mobs.
-* Fixed blocks (e.g. sugar canes) adjacent to physics blocks (e.g. sand) not updating.
-* Fixed a NullPointerException that occurred sometimes when generating the scheduler section of the report function (`/wg report`).
-* Fixed the "no XP drops" configuration not functioning following a previous release.
-* Fixed changes to region ownership sometimes not triggering a region database save.
-* Fixed bucket protection displaying the "deny effect" even if bucket use was not prevented.
-* Fixed CommandFilter matching emoticons and other unwanted characters.
-* Fixed an exception occurring sometimes during game mode changes.
-* Fixed primed TNT being checked twice for TNT flags.
-
-## 6.0 beta 5
-
-MC 1.7.9, 1.7.10 and 1.8 (Spigot only) are supported.
-
-* Added a feature to detect when another plugin (incorrectly) includes WorldGuard's files, causing errors.
-* Added a new `exit-override` flag that can be used on an entry=allow region that players can walk into from an entry=deny region.
-* Added a new `entry-deny-message` to change the "entry denied" message.
-* Added a new `exit-deny-message` to change the "exit denied" message.
-* Changed entry/exit blocking to disembark players from their vehicles.
-* Changed the PvP flag to no longer apply to self-attack.
-* Fixed [#3220](http://youtrack.sk89q.com/issue/WORLDGUARD-3220): Polygon regions sharing points
-* Fixed [#3216](http://youtrack.sk89q.com/issue/WORLDGUARD-3216): Polygon regions 'disappearing' or not working correctly
-* Fixed [#3315](http://youtrack.sk89q.com/issue/WORLDGUARD-3315): Invincibility flag and mode not blocking knockback from snowballs, etc.
-* Fixed [#3314](http://youtrack.sk89q.com/issue/WORLDGUARD-3314): Protection bypassable by getting a skeleton or creeper to target a player
-* Fixed [#3326](http://youtrack.sk89q.com/issue/WORLDGUARD-3326): Enderchests cannot be protected with the use flag
-* Fixed [#3327](http://youtrack.sk89q.com/issue/WORLDGUARD-3327): Fake players from some Forge mods are not being detected properly
-* Fixed [#3328](http://youtrack.sk89q.com/issue/WORLDGUARD-3328): TypeToken error with CraftBukkit 1.7 in `/wg report`
-* Fixed [#3086](http://youtrack.sk89q.com/issue/WORLDGUARD-3086): Region entry / exit messages overlap between seprate worlds
-* Fixed [#2542](http://youtrack.sk89q.com/issue/WORLDGUARD-2542): Exit deny regions don't handle respawn / logout consistently
-* Fixed [#2731](http://youtrack.sk89q.com/issue/WORLDGUARD-2731): Greeting / farewell messages don't understand region inheritance
-* Fixed [#3308](http://youtrack.sk89q.com/issue/WORLDGUARD-3308): Enderchest interaction block not functioning with blacklist.txt
-* Fixed [#3312](http://youtrack.sk89q.com/issue/WORLDGUARD-3312): PVP flag blocking enderpearl teleport fall damage
-* Fixed [#3309](http://youtrack.sk89q.com/issue/WORLDGUARD-3309): Inventory view commands being blocked in protected regions
-* Fixed [#3310](http://youtrack.sk89q.com/issue/WORLDGUARD-3310): USE flag is not allowing workbench usage
-* Fixed [#3330](http://youtrack.sk89q.com/issue/WORLDGUARD-3330): Build permissions preventing block placement
-* API: Added `BukkitUtil.toRegion(Chunk)`
-
-## 6.0 beta 4
-
-MC 1.7.9, 1.7.10 and 1.8 (Spigot only) are supported.
-
-* Added better support for MC 1.8 blocks (regarding the use flag, etc.).
-* Added an an experimental "lite" version of WarmRoast to CPU profile your server (try it: `/wg profile -p`)
-* Added permissions for individual flag values (i.e. `worldguard.region.flag.flags.use.allow`).
-* Added support for slightly older versions of Bukkit 1.7.9.
-* Improved `/wg report`'s output (try it: `/wg report -p`)
-* Fixed armor stands not being protected properly.
-* Fixed lack of wood plate support with the `USE` flag.
-* Fixed left click also being blocked when only right click needed to be blocked.
-* Fixed items and paintings/item frames not decaying under some versions of Spigot.
-* Fixed parent-child inheritance so the child will always inherit the parent.
-* Fixed inheritance issues with a flag is set with a region group on a parent region.
-* Fixed high CPU usage when Citizens is also installed.
-* Fixed `on-acquire` in the blacklist so it also handles item transfers between inventories.
-* Fixed the blacklist not supporting color codes.
-* Changed the PvP flag so it applies to self-attack like in WG 5 (this change *may* be reverted).
-
-## 6.0 beta 3
-
-MC 1.7.10 and 1.8 (Spigot only) are supported.
-
-* Support both MC 1.7.10 and 1.8.
-* Don't apply the region override permission to PvP.
-* Fix incorrect detection of hostile and ambient creatures when protecting against PvE.
-* Fix the splash potion flag not working with the other flags.
-* Fix potion blocking.
-* Fix inability to blacklist the enchantment table and the workbench.
-* Make PASSTHROUGH=DENY useful on ``__global__``.
-* Fix issues (pistons broken, etc.) caused by adding members to ``__global__``.
-* Make the EXP_DROPS flag a build-compat flag and set its deny message.
-* Give the player back his/her XP bottle if it was blocked.
-* Expand the interaction whitelist configuration to "physical" events.
-* Catch command prefixes in the command flags.
-* Add a RIDE flag for vehicles.
-* Check for names in addition to UUIDs with /rg list.
-* Whitelist hoppers and let them cross regions regardless of region protection.
-* Revert USE flag's functionality to 5.x, add new INTERACT flag.
-* Fix spawn egg blocking.
-* Fix failed detection of incorrect blacklist block and item names.
-* Fix command prefix bypass with the op command blocking configuration.
-* Rewrite and update report generation (wg report).
-* Add event cancellation debug commands.
-* Fix location flags causing NullPointerExceptions.
-* Show more details in error log which world the error belongs to.
-* Add missing color codes when parsing input.
-* Let players use NPCs always.
-* Fix [WorldGuard] in log messages stacking on reloads.
-* Better handle empty group / player names due to bad region data.
-* Fix players being invincible with BUILD=deny.
-* Fix certain entities not being damaged in protected regions.
-* Improve entity detection in Entities utility class, add Entities.isNonPlayerCreature().
-* Add missing SQL table prefix in statement selecting world names.
-
-## 6.0 beta 2
-
-* Added an `-e` parameter to `/rg flag` that sets the flag to an empty value. You can use this to, for example, make it so the `deny-message` flag is empty, meaning that players won't get a message at all.
-* Added a visual smoke effect when an action on a block has been denied.
-* Added `event-handling.interaction-whitelist`, a list of items or blocks that should never be protected. For example, adding `wooden_door` to the list would make it so that doors could be used by anyone regardless if they have permission or not. You may still protect the blocks via other means.
-* Added `event-handling.emit-block-use-at-feet`, a list of items that, when used, will also be considered as the player using that item on the block at the player's feet. The purpose of this setting is, for example, to allow you to (sort of) prevent the use of a mod-added item that does not emit events.
-* Added `-s` to silently turn toggle `/stoplag` and `-i` to show the current state of the setting. (Thanks, [stuntguy3000](https://github.com/stuntguy3000)).
-* Added support for Bukkit [Material](http://jd.bukkit.org/rb/apidocs/org/bukkit/Material.html) names in the blacklist.
-* Fixed [#3167](http://youtrack.sk89q.com/issue/WORLDGUARD-3167): Saplings can be used without permission although it won't place blocks inside the region
-* Fixed [#3168](http://youtrack.sk89q.com/issue/WORLDGUARD-3168): Grown saplings that are partially prevented from placing all of its leaves may not remove the sapling
-* Fixed [#3169](http://youtrack.sk89q.com/issue/WORLDGUARD-3169): Bonemeal usage falls under the USE flag when it should really fall under building
-* Fixed [#3174](http://youtrack.sk89q.com/issue/WORLDGUARD-3174): Boat placement is not properly prevented in a protected region
-* Fixed [#3130](http://youtrack.sk89q.com/issue/WORLDGUARD-3130): Polygonal selections allow unlimited claim volumes with /rg claim
-* Fixed [#3137](http://youtrack.sk89q.com/issue/WORLDGUARD-3137): Claiming infinite regions is possible due to integer overflow
-* Fixed [#3171](http://youtrack.sk89q.com/issue/WORLDGUARD-3171): Can't pickup XP in protected regions without permission
-* Fixed [#3170](http://youtrack.sk89q.com/issue/WORLDGUARD-3170): Boats without a driver can be used to break lily pads
-* Fixed [#3172](http://youtrack.sk89q.com/issue/WORLDGUARD-3172): Players cannot be damaged by mobs in protected regions unless they have permission
-* Fixed [#3152](http://youtrack.sk89q.com/issue/WORLDGUARD-3152): BUILD overrides all other flags, unlike in WG 5
-* Fixed [#3154](http://youtrack.sk89q.com/issue/WORLDGUARD-3154): notify-enterflag doesn't work with horses and other vehicles
-* Fixed [#3166](http://youtrack.sk89q.com/issue/WORLDGUARD-3166): Trees do not grow naturally within protected regions
-
-## 6.0 beta 1
-
-### UUID support
-
-Regions now fully support the use of UUIDs rather than names for storing the owners and members of a region. Commands still accept names, but they are translated into UUIDs in the background. For users who already have existing region data, names will be automatically converted to UUIDs on the first run of WorldGuard.
-
-It is still possible to specify names rather than a UUID by using the `-n` flag with the region membership commands.
-
-### 'Deny by default'
-
-Previously, a pre-determined list of blocks and entities was used to determine whether an action by the player should be blocked. However, this has been reversed so that every action on a block or entity is denied (in a protected region) unless it has been deemed safe (such as, for example, right clicking with steak). Mods are now supported as a result.
-
-The `USE` flag has been repurposed as a general "interaction" flag and covers every left click or right click of a block or entity. It also covers interaction that falls outside clicking.
-
-### Exhaustive protection
-
-More events are now handled in the protection code. For example,
-
-* It is no longer possible to drop sand or gravel into a protected region from outside.
-* It is no longer possible to grief a region by growing a tree into it.
-* The entry and exit flags now handle players sitting on vehicles properly.
-* Piston-moved blocks cannot be pushed into a different protected region.
-* Owners of tamable animals are now considered in protection code.
-
-Even water and lava flow can also be checked, although this requires that it be explicitly enabled in the configuration (flow events are very frequent, so they incur extra CPU cost).
-
-The goal is to provide extremely exhaustive protection.
-
-### Large performance boost for spatial queries
-
-The performance of spatial queries for regions has been substantially increased at least an order of magnitude. Spatial queries are a necessity for the region code to query the list of regions that apply to a location in the world. There should be a negligible difference between 4, 40, and 4000 regions as long as too many regions are not overlapping.
-
-### Background region operations
-
-Region commands are now executed in the background. Notably, saves and loads will not lock up your server while they complete. Additionally, changes to regions are now saved periodically rather than immediately after every change.
-
-### Updated MySQL region support
-
-MySQL support has been completely overhauled. It should now be faster, no longer crash on foreign key index errors, use transactions, and support automatic creation and migration of tables (including support for table prefixes).
-
-### Partial region data saving
-
-For users of MySQL, WorldGuard now only saves changed and deleted regions when saving region data. No longer does WorldGuard have to rewrite the entire region database on each save.
-
-### Improved handling of related flags
-
-Multiple flags that apply to an event are now evaluated together if they are similar. For example, if a player right clicks a bed to sleep in it, both the `USE` and `SLEEP` flag are checked since they are both interaction-related. If one of them is `DENY`, then sleeping is denied (remember, `DENY` overrides `ALLOW`). If one of them is `ALLOW` and the other is not `DENY`, then sleeping is permitted.
-
-Only one "category" of flags needs to evaluate to true to permit an action. `DENY` will not cross categories. For example, if `BUILD` is deny, it will not override `SLEEP`, so if `SLEEP` is set to `ALLOW`, sleeping will be permitted. This is fairly similar to how it worked on WorldGuard 5.
-
-### Flag groups now work properly
-
-While you could always set a group to a flag's value, the functionality was incomplete and did not work most of the time.
-
-Now that groups are supported, you can change a flag so it only applies to a certain group of players. For example, `/rg flag example sleep deny -g members` would deny sleeping for only members of the `example` region.
-
-### Inheritance now works as expected
-
-Previously, a region only inherited flags and other details from its parents if the parent and the child overlapped at the location queried. This is no longer the case and inheritance is now always applied. 
-
-In addition, a new `-g` flag for `/rg define` lets you create a region with no physical area so that you can assign flags and use this region as a "template region."
-
-### Settable deny message
-
-It is now possible to change the message that users get when they are prevented from interacting with blocks or entities. This message is defined as a region flag, so you can set it on the `__global__` region or override it in a specific region. In addition, the tone and color of the default message has been softened, but you are free to change it entirely.
-
-### Blacklist support for data values (and later, variants)
-
-The blacklist was rewritten to support more than just block and item IDs. The immediate result is that you can now use data values, but as those are in the process of being deprecated by Mojang, it also allows support for Minecraft's new block variants in the future.
-
-### Debounced events
-
-Events that tend to reoccur very frequently (such as the ones that occur when you stand on a pressure plate continuously) have been "debounced" to reduce the number of checks that WorldGuard has to perform, reducing the amount of wasted CPU. In addition, the "you don't have permission" message is rate limited so players are not flooded with the message.
-
-### New block place and break flags
-
-A long requested feature was the availability of block place and break flags. These newly added flags work in tandem with the `BUILD` flag but can override `BUILD`. At the moment, it is not possible to allow explicit types of blocks to be placed or broken yet.
-
-### Build permission nodes
-
-A new optional (disabled by default in the configuration) feature is the checking of build permission nodes. For every block, entity, and item, the following permission nodes are checked:
-
-* Block place: `worldguard.build.block.place.<material>`
-* Block break: `worldguard.build.block.remove.<material>`
-* Block interact: `worldguard.build.block.interact.<material>`
-* Entity spawn: `worldguard.build.entity.place.<type>`
-* Entity destroy: `worldguard.build.entity.remove.<type>`
-* Entity interact: `worldguard.build.entity.interact.<type>`
-* Entity damage: `worldguard.build.entity.damage.<type>`
-* Item use: `worldguard.build.item.use.<material>`
-
-In addition, the permissions are also checked in the style of `worldguard.build.block.<material>.<action>`, so `worldguard.build.block.<material>.place` would work too.
-
-The list of usable material names comes from the [Material enumeration in Bukkit](http://jd.bukkit.org/rb/apidocs/org/bukkit/Material.html). For example, the permission for placing the bed block would be `worldguard.build.build.place.bed_block`. Be aware that _Material_ contains both item and block names.
-
-For entity names, see [EntityType](http://jd.bukkit.org/rb/apidocs/org/bukkit/entity/EntityType.html).
-
-### Other changes
-
-* Added a setting to permit "fake players" to bypass protection. Fake players are used by some servers and some mods to allow events to be thrown for mod blocks. WorldGuard considers a player to be a fake player if the name starts with `[` and ends with `]`.
-* Added a check so players can no longer disembark in a region from their tamed animal if they don't have permission to get back on.
-* Added an item pickup flag to go along with the item drop flag.
-* Added a new `//running` command was added to show currently running background tasks.
-* Added a blacklist `on-dispense` event.
-* Added more detailed error messages when parsing the YAML regions file.
-* Added the `-Dworldguard.debug.listener=true` option that can be set on your server's command line to see how WorldGuard processes events, although this will result in a lot of log messages.
-* Added log messages that occur on player join when a player had auto-god mode or auto-amphibious mode.
-* Fixed the heal command so that it now sets a player's health to the maximum rather than 20.
-* Fixed `ProtectedCuboidRegion.getPoints()` returning points in wrong order.
-* Fixed the obsidian generator disable option to also apply to tripwire.
-* Fixed an error with the blocked commands flag.
-* Fixed a connection leak with the MySQL region code.
-* Fixed `/wg reload` sometimes not applying new changes right away.
-* Changed the region removal command so that child regions are no longer removed without warning when removing the parent region.
-* Changed the YAML region data save code to first write the data to a temporary file before replacing the final file.
-* Changed how region data is handled when region support is disabled: it is no longer loaded.
-* Changed sponges to now be disabled by default. However, if you had previously installed WorldGuard, sponges will still be enabled. Sponges are being added in Minecraft and they work differently than in Minecraft Classic (which WorldGuard emulates). In addition, enabling sponge support in WorldGuard incurs extra CPU cost even if no sponges exist in the world.
-* Changed how region data is loaded and saved so failures are now more graceful. If the region data fails to load for a world, then the entire world will be protected by default. In addition, periodic attempts will be made to load the region data in the background.
-* Changed the `FEED` flag to maximize the player's saturation level if the hunger level is raised.
-* Changed the `wg-invincible` and `wg-amphibious` groups feature so that it now must be enabled in the configuration.
-* Removed the ability for WorldGuard to upgrade from a version for Minecraft Alpha.
-
-### API changes
-
-* You can use a new `WorldGuardPlugin.createProtectionQuery()` method to easily check build permissions.
-* The listener classes were moved. Consider them internal -- if you want to make use of the listener somehow, please put in a ticket in our issue tracker.
-* Much of the protection-related handling was previously scattered throughout the code. Now WorldGuard funnels events into an internal event system and then processes protection queries in a more consistent matter. These events are for internal use so it is strongly recommended that you do not use them (they may change without notice drastically). A lot of the protection-related flag handling was moved there.
-* A significant portion of classes under the package of `com.sk89q.worldguard.protection` were changed or removed. However, the basic calls (testing the value of a flag, etc.) should still work, but they may be deprecated. Some of the utility `Domain`-related classes were removed.
-* The old region database (load/save) API was removed and replaced with a new one. The new one no longer needs to pointless store a collection of regions on itself -- it has `collection = load()` and `save(collection)` methods.
-* Previously, there were subclasses of `RegionManager` that implemented different spatial indices. However, now `RegionManager` is a final class and the spatial indices are separate (see the `RegionIndex` interface).
-* A hash table was implemented that caches a list of regions within each loaded chunk. This increases performance of spatial queries substantially.
-* A cache of recent spatial queries now exists (a cache of `ApplicableRegionSets`), but you need to make use of `RegionQuery` to make use of this cache. However, if you need to do a spatial query to modify region data, then the old method is better (get a `RegionManager`, etc.).
-* `ApplicableRegionSet` was converted into an interface. In addition, there are now "virtual" `ApplicableRegionSet` instances that are returned by `RegionQuery` for certain special cases (such as, for example, region support being disabled by the user or region data being unavailable for a world due to an error). A new `isVirtual()` method is available. This is not an issue if you are getting `ApplicableRegionSet` instances from a `RegionManager`.
-* `ApplicableRegionSet` now can accept a pre-sorted collection and its use of a `TreeSet` was removed for performance reasons.
-* `FileNotFoundException` is now properly handled in the YAML region file class. It creates the new file and continues on.
-* Player names are deprecated by Mojang and so they need to be converted into UUIDs. As this will take some time, you should do this conversion in a background task. To check whether a region contains a player, it recommended that `contains(LocalPlayer)` be used because it's possible that the user may be still using names. A new `WorldGuardPlugin.wrapOfflinePlayer()` method was added for this specific purposes.
-* All flags now use `RegionGroup.ALL` as the default region group.
-* `StateFlag.getDefault()` now returns a `State` rather than a `boolean`.
-* The priority R-tree index now uses the R-tree for region intersection queries. Previously, it was only used for single point containment queries.
-* Regions now keep a "dirty" flag and changes it whenever data within the region is changed. When WorldGuard decides to periodically save region data, it may only save changed regions. Calling `save()` on the `RegionManager` is no longer needed as periodical saves happen automatically.
-* The old region data migration API was removed in favor of region store drivers. There is no longer a need to have an implementation for every possible conversion (i.e. YAML -> MySQL, MySQL -> YAML, etc.).
-* `ProtectedRegion.copyFrom()` was added to copy region settings from another region.
-* `@Nullable` annotations were added throughout the code. If you use IntelliJ IDEA, you may notice that it now warns you when a return value may be `null`.
-
-## 5.9
-
-* Added a config option to allow explosion flags to only prevent block damage
-* Added allow-tamed-spawns setting, on by default. This will stop WorldGuard from culling tamed animals.
-* Added config option and flag to prevent soil from drying naturally.
-* Added formatting codes, &k/l/m/n/o and &x (reset).
-* Added snow-fall-blocks option to config to restrict snow fall to certain blocks
-* Allow players to add newlines (\n) via command, not just manually in yml.
-* Allow the console to load/save all region managers with one command.
-* Changed entity report format slightly.
-* Check bypass perms for item-drop flag.
-* Check for entities and projectiles removing items from frames too.
-* Fix being able to use bonemeal to turn tall grass into double plants.
-* Fix number of arguments for migratedb command.
-* Fixed addowner/addmember commands adding command artifacts. Specifically,  "-w <world>" will no longer be added when using it.
-* Fixed milking cows in protected areas due to changes in Bukkit.
-* Fixed ProtectedCuboidRegion::getPoints() returning points in wrong order.
-* Fixed snowman trails being treated as snow fall.
-* Make /rg list default to own regions if the player doesn't have permission otherwise.
-* Protected items in item frames in protected regions.
-* Resolved an issue where explosions of type OTHER_EXPLOSION were ignoring the world  configuration settings.
-* Send item-use blacklist event when right-clicking entities.
-* Transformed the BlockFadeEvent handler into a switch.
-
-## 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.
-
-## 3.2.2
-
-* Changed disable-water-damage to disable-drowning-damage.
-* Fixed suffocation disable option.
-* Fixed fire spread blocking.
-* stopfire and allowfire now work in server console, just like in hMod.
-
-## 3.2.1
-
-* Updated for recent Bukkit ItemStack change.
-
-## 3.2
-
-* Added regions.default.pvp to control default PvP setting.
-* Updated WorldGuard for the newer builds of Bukkit.
-* Fixed creeper explosion blocking.
-* Added redstone support to sponges, removed classic water.
-* Fixed item durability disable for hoes.
-
-
-## 3.1.2
-
-* Increased the priority of WorldGuard's event handling.
-
-## 3.1.1
-
-* Fixed creeper and chest flag conflicting.
-
-## 3.1
-
-* Added ability to disable chest protection. New configuration setting (regions.build.chest-access) and new chest flag.
-* Possibly fixed projectile blocking in no-PvP zones.
-* Added /regionmembership permission that lets people only change the owners and members of regions they own.
-
-## 3.0b2
-
-* Fixed issue where built-in permissions were not (re)loaded.
-* Fixed /god not working for others.
-
-## 3.0b1
-
-* Added parent-child relationships to regions.
-* Added global build flag.
-* Improved flag support.
-* Fixed no-PvP zone messages being sent to the wrong person.
-* Fixed commands so that they work in a recent version of Bukkit.
-* Fixed NullPointerException in explode hook.
-
-## 2.3.1
-
-* Fixed various cast exceptions with the blacklist loggers.
-* Added checks for unchecked exceptions when resolving permissions.
-* Fixed the item durability disable setting changing the damage value on an empty hand.
-
-## 2.3
-
-* /god now works very well.
-* Item (TNT, flint and steel, etc.) blocking should now work.
-* The TNT blocking configuration variable should now work.
-* Re-added /heal (not sure where that went), added /slay.
-* Implemented contact damage disable toggle.
-* Made all player damage disabling configuration parameters work.
-* Fixed teleport-on-suffocation setting.
-* Added /locate <name>, /locate <x> <y> <z>, and /locate that lets you program/change your compass bearing to point to a player's position (not yet live), a position, or back to spawn.
-* Fixed CSVDatabase spitting an error if the owners list was empty.
-
-## 2.2
-
-* Now supports GroupUsers.
-* Added support for blocking creeper explosions.
-* Fixed a bug where a player's groups were not being loaded correctly, causing the blacklist group ignore option to not work.
-
-## 2.1.1
-
-* Fixed fire spread disable preventing flint and steel too.
-* Fixed NullPointerException related to the player item event.
-* Made setup simpler.
-
-## 2.1
-
-* Improved Bukkit support.
-
-## 2.0beta3
-
-* Fixed NullPointerException inside the ignite hook.
-
-## 2.0beta2
-
-* Fixed a NullPointerException in the damage hook.
-
-## 2.0beta1
-
-* Added area protection. Use /region or /rg to define regions.
-
-## 1.8.1
-
-* Fixed NullPointerException.
-
-## 1.8
-
-* Updated for Minecraft beta.
-* Blacklist hooks have CHANGED. The new hooks are work better. on-create has been replaced with on-place (for block placement) and on-use (for item usage, light buckets and lighters). The old on-use is now on-right-click although it currently does nothing.
-* Added coordinates to blacklist file logger.
-* Added suffocation damage prevention.
-
-## 1.7.1
-
-* Updated for v0.2.8.
-
-## 1.7
-
-* Updated for v0.2.6_02 and hMod b129.
-* Added option to prevent water from damaging particular blocks (Redstone wire, Minecart tracks, etc.). See disable-water-damage-blocks.
-* /reload WorldGuard should now reload WorldGuard's configuration.
-* Added wg-invincible and wg-amphibious groups that let you give certain players invincibility or underwater breathing.
-* Added the ability to disable fall, water, lava, and/or fire damage.
-* Water/lava bucket blocking should now be more reliable.
-* Added /stack (alias /;) commands to stack items in your inventory into piles up to 64 items in size. Even unstackable items like signs can be stacked.
-* /god mode should now let you gain health.
-* /god mode should now work more reliably.
-* Caught an error message for when the configuration file does not exist.
-
-## 1.6
-
-* Added spawn protection that prevents damage when a player spawns.
-* Added login protection that prevents damage when a player joins.
-* Added /god. /god can be used on others, provided that the /godother permission is set for the command's user.
-
-## 1.5.1
-
-* Removed the 'java.lang.NoSuchMethodError: Item.setDamage(I)V' error generated.
-
-## 1.5
-
-* Removed the block lag fix.
-* WorldGuard now conditionally loads features so you can use any up-to-date build of hMod and the unsupported features won't break the entire plugin. When WG loads, check the server console for a report of features that are not supported by your version of hMod.
-* Changed some configuration defaults: disable-lava-fire=true simulate-sponge=true item-durability=false
-
-## 1.4.1
-
-* Fixed issue with the block lag fix dropping item stacks of 0 quantity.
-
-## 1.4
-
-* New on-acquire hook. This does both a total inventory check on inventory change and item pick up denial. The item pick up denial is largely thanks to Dinnerbone for fulfilling my request to add a particular hook.
-* Item durability can now be toggled with item-durability. Thanks to Dinnerbone for figuring this out while filfilling my request. The default setting is to fix item durability.
-* New no-physics-gravel and no-physics-sand options allow you to prevent gravel and sand from falling.
-* New allow-portal-anywhere option allows you to create portal blocks anywhere. 
-
-## 1.3
-
-* UPGRADE WARNING: If you are using database logging, you must add a NULL 'comment' VARCHAR field to the table. The line of SQL that you can run for MySQL can be found in blacklist_table.sql.
-* Improved plugin compatibility with the block lag fix. For maximum compatibility, you must now list WorldGuard as the first plugin in server.properties and you cannot reload or enable the plugin while the server is up. This is for bad plugins that unnecessarily use the "critical" priority for its hooks like the LWC. Most plugins don't do that though, so this won't apply for most people.
-* Fixed signs being blank if they were denied via the blacklist.
-* Added on-break event to the blacklist.
-* Added comments and messages. Comments are only for your own use and they are printed with the log and notify actions of the blacklist. The message replaces the message that is shown the user and it is optional.
-* The blacklist notification messages are now more compact and are light grey instead of light purple.
-* The notify, log, and tell actions will now trigger every time for the on-break, on-create, on-drop events rather than wait 3 seconds between events for the same item or block for a player.
-
-## 1.2
-
-* /stopfire and /allowfire disable and enable fire spreading globally.
-* Block lag fix slightly improved in accuracy for item drops.
-* Sponge updated to remove water when the sponge block is set. Sponge radius can now be controlled using the 'sponge-radius' parameter and the default is now set to simulate Classic.
-* Updated for a newer build of "b126," meaning that lava spread control now works well!
-* A new summary of the status of some core protections is now printed on start. Disable this with 'summary-on-start'.
-* Blacklist system has been overhauled. Check README.txt for changed configuration settings!
-* The blacklist's method of preventing notification repeats is now better, instead waiting 3 seconds before notifying again (before it didn't notify again at all unless the user started using another blocked action).
-* To give users the ability to receive notifications, the command to give permission to has been changed to /worldguardnotify, although the old one (that was never mentioned anywhere) still works.
-* Water and lava buckets are now psuedo-blocked using an unreliable method that risks the stability of your server (no other plugin does it better though). Use it as your own risk.
-* Added on item drop and on item use (i.e. chest) events.
-* Chests, signs, and furnaces can now be blocked better with the blacklist system.
-* The event names in the blacklist configuration have changed but the old event names should still work. The new names should make "more sense."
-* A new "ban" action has been added to the blacklist.
-* Action messages have been improved, now longer saying "destroyed" for everything.
-* Logging to file has been completely changed, allowing you to use the date and time and the player's username in the log filename. It no longer rotates log files based on size, however.
-* Logging to database is now supported.
-* Tools can now be destroyed on drop to alleviate the durability cheat. You can do this with either with the blacklist or with the 'item-drop-blacklist' configuration option. The configuration option prints more friendly messages than the 'tell' action of blacklists.
-
-## 1.1.2
-
-* Block lag fix: Snow and glass should no longer drop items.
-* Block lag fix: Block object now reset after hook call.
-
-## 1.1.1
-
-* Fixed redstone wire dropping wood blocks with the block lag fix.
-* The block lag fix now consults other plugins so that ALL protection mechanisms and plugins should work.
-
-## 1.1
-
-* Added block lag fix.
-
-## 1.0
-
-* Initial release.

CHANGELOG.txt

@@ -0,0 +1,614 @@
+5.9
+- Added a config option to allow explosion flags to only prevent block damage
+- Added allow-tamed-spawns setting, on by default. This will stop WorldGuard
+    from culling tamed animals.
+- Added config option and flag to prevent soil from drying naturally.
+- Added formatting codes, &k/l/m/n/o and &x (reset).
+- Added snow-fall-blocks option to config to restrict snow fall to certain blocks
+- Allow players to add newlines (\n) via command, not just manually in yml.
+- Allow the console to load/save all region managers with one command.
+- Changed entity report format slightly.
+- Check bypass perms for item-drop flag.
+- Check for entities and projectiles removing items from frames too.
+- Fix being able to use bonemeal to turn tall grass into double plants.
+- Fix number of arguments for migratedb command.
+- Fixed addowner/addmember commands adding command artifacts. Specifically, 
+    "-w <world>" will no longer be added when using it.
+- Fixed milking cows in protected areas due to changes in Bukkit.
+- Fixed ProtectedCuboidRegion::getPoints() returning points in wrong order.
+- Fixed snowman trails being treated as snow fall.
+- Make /rg list default to own regions if the player doesn't have permission otherwise.
+- Protected items in item frames in protected regions.
+- Resolved an issue where explosions of type OTHER_EXPLOSION were ignoring the world 
+    configuration settings.
+- Send item-use blacklist event when right-clicking entities.
+- Transformed the BlockFadeEvent handler into a switch.
+
+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.
+
+3.2.2:
+- Changed disable-water-damage to disable-drowning-damage.
+- Fixed suffocation disable option.
+- Fixed fire spread blocking.
+- stopfire and allowfire now work in server console, just like in hMod.
+
+3.2.1:
+- Updated for recent Bukkit ItemStack change.
+
+3.2:
+- Added regions.default.pvp to control default PvP setting.
+- Updated WorldGuard for the newer builds of Bukkit.
+- Fixed creeper explosion blocking.
+- Added redstone support to sponges, removed classic water.
+- Fixed item durability disable for hoes.
+
+
+3.1.2:
+- Increased the priority of WorldGuard's event handling.
+
+3.1.1:
+- Fixed creeper and chest flag conflicting.
+
+3.1:
+- Added ability to disable chest protection. New configuration setting
+    (regions.build.chest-access) and new chest flag.
+- Possibly fixed projectile blocking in no-PvP zones.
+- Added /regionmembership permission that lets people only change
+    the owners and members of regions they own.
+
+3.0b2:
+- Fixed issue where built-in permissions were not (re)loaded.
+- Fixed /god not working for others.
+
+3.0b1:
+- Added parent-child relationships to regions.
+- Added global build flag.
+- Improved flag support.
+- Fixed no-PvP zone messages being sent to the wrong person.
+- Fixed commands so that they work in a recent version of Bukkit.
+- Fixed NullPointerException in explode hook.
+
+2.3.1:
+- Fixed various cast exceptions with the blacklist loggers.
+- Added checks for unchecked exceptions when resolving permissions.
+- Fixed the item durability disable setting changing the damage value on
+    an empty hand.
+
+2.3:
+- /god now works very well.
+- Item (TNT, flint and steel, etc.) blocking should now work.
+- The TNT blocking configuration variable should now work.
+- Re-added /heal (not sure where that went), added /slay.
+- Implemented contact damage disable toggle.
+- Made all player damage disabling configuration parameters work.
+- Fixed teleport-on-suffocation setting.
+- Added /locate <name>, /locate <x> <y> <z>, and /locate that lets you
+    program/change your compass bearing to point to a player's position
+    (not yet live), a position, or back to spawn.
+- Fixed CSVDatabase spitting an error if the owners list was empty.
+
+2.2:
+- Now supports GroupUsers.
+- Added support for blocking creeper explosions.
+- Fixed a bug where a player's groups were not being loaded correctly,
+    causing the blacklist group ignore option to not work.
+
+2.1.1:
+- Fixed fire spread disable preventing flint and steel too.
+- Fixed NullPointerException related to the player item event.
+- Made setup simpler.
+
+2.1:
+- Improved Bukkit support.
+
+2.0beta3:
+- Fixed NullPointerException inside the ignite hook.
+
+2.0beta2:
+- Fixed a NullPointerException in the damage hook.
+
+2.0beta1:
+- Added area protection. Use /region or /rg to define regions.
+
+1.8.1
+- Fixed NullPointerException.
+
+1.8
+- Updated for Minecraft beta.
+- Blacklist hooks have CHANGED. The new hooks are work better. on-create has
+    been replaced with on-place (for block placement) and on-use
+    (for item usage, light buckets and lighters). The old on-use is now
+    on-right-click although it currently does nothing.
+- Added coordinates to blacklist file logger.
+- Added suffocation damage prevention.
+
+1.7.1
+- Updated for v0.2.8.
+
+1.7
+- Updated for v0.2.6_02 and hMod b129.
+- Added option to prevent water from damaging particular blocks
+    (Redstone wire, Minecart tracks, etc.). See disable-water-damage-blocks.
+- /reload WorldGuard should now reload WorldGuard's configuration.
+- Added wg-invincible and wg-amphibious groups that let you give certain
+    players invincibility or underwater breathing.
+- Added the ability to disable fall, water, lava, and/or fire damage.
+- Water/lava bucket blocking should now be more reliable.
+- Added /stack (alias /;) commands to stack items in your inventory into
+    piles up to 64 items in size. Even unstackable items like signs can be
+    stacked.
+- /god mode should now let you gain health.
+- /god mode should now work more reliably.
+- Caught an error message for when the configuration file does not exist.
+
+1.6
+- Added spawn protection that prevents damage when a player spawns.
+- Added login protection that prevents damage when a player joins.
+- Added /god. /god can be used on others, provided that the /godother
+    permission is set for the command's user.
+
+1.5.1
+- Removed the 'java.lang.NoSuchMethodError: Item.setDamage(I)V' error
+    generated.
+
+1.5
+- Removed the block lag fix.
+- WorldGuard now conditionally loads features so you can use any up-to-date
+    build of hMod and the unsupported features won't break the entire
+    plugin. When WG loads, check the server console for a report of
+    features that are not supported by your version of hMod.
+- Changed some configuration defaults:
+    disable-lava-fire=true
+    simulate-sponge=true
+    item-durability=false
+
+1.4.1
+- Fixed issue with the block lag fix dropping item stacks of 0 quantity.
+
+1.4
+- New on-acquire hook. This does both a total inventory check on inventory
+    change and item pick up denial. The item pick up denial is largely
+    thanks to Dinnerbone for fulfilling my request to add a particular hook.
+- Item durability can now be toggled with item-durability. Thanks to
+    Dinnerbone for figuring this out while filfilling my request. The
+    default setting is to fix item durability.
+- New no-physics-gravel and no-physics-sand options allow you to
+    prevent gravel and sand from falling.
+- New allow-portal-anywhere option allows you to create portal blocks
+    anywhere.
+    
+1.3
+- UPGRADE WARNING: If you are using database logging, you must add a
+    NULL 'comment' VARCHAR field to the table. The line of SQL that you
+    can run for MySQL can be found in blacklist_table.sql.
+- Improved plugin compatibility with the block lag fix. For maximum
+    compatibility, you must now list WorldGuard as the first plugin in
+    server.properties and you cannot reload or enable the plugin
+    while the server is up. This is for bad plugins that unnecessarily
+    use the "critical" priority for its hooks like the LWC. Most plugins
+    don't do that though, so this won't apply for most people.
+- Fixed signs being blank if they were denied via the blacklist.
+- Added on-break event to the blacklist.
+- Added comments and messages. Comments are only for your own use and they
+    are printed with the log and notify actions of the blacklist. The
+    message replaces the message that is shown the user and it is optional.
+- The blacklist notification messages are now more compact and are
+    light grey instead of light purple.
+- The notify, log, and tell actions will now trigger every time for the
+    on-break, on-create, on-drop events rather than wait 3 seconds between
+    events for the same item or block for a player.
+
+1.2
+- /stopfire and /allowfire disable and enable fire spreading globally.
+- Block lag fix slightly improved in accuracy for item drops.
+- Sponge updated to remove water when the sponge block is set. Sponge radius
+    can now be controlled using the 'sponge-radius' parameter and the
+    default is now set to simulate Classic.
+- Updated for a newer build of "b126," meaning that lava spread control
+    now works well!
+- A new summary of the status of some core protections is now printed
+    on start. Disable this with 'summary-on-start'.
+- Blacklist system has been overhauled. Check README.txt for changed
+    configuration settings!
+- The blacklist's method of preventing notification repeats is now better,
+    instead waiting 3 seconds before notifying again (before it didn't
+    notify again at all unless the user started using another blocked
+    action).
+- To give users the ability to receive notifications, the command to give
+    permission to has been changed to /worldguardnotify, although the
+    old one (that was never mentioned anywhere) still works.
+- Water and lava buckets are now psuedo-blocked using an unreliable
+    method that risks the stability of your server (no other plugin
+    does it better though). Use it as your own risk.
+- Added on item drop and on item use (i.e. chest) events.
+- Chests, signs, and furnaces can now be blocked better with the
+    blacklist system.
+- The event names in the blacklist configuration have changed but the old
+    event names should still work. The new names should make "more sense."
+- A new "ban" action has been added to the blacklist.
+- Action messages have been improved, now longer saying "destroyed"
+    for everything.
+- Logging to file has been completely changed, allowing you to use
+    the date and time and the player's username in the log filename. It
+    no longer rotates log files based on size, however.
+- Logging to database is now supported.
+- Tools can now be destroyed on drop to alleviate the durability cheat.
+    You can do this with either with the blacklist or with the
+    'item-drop-blacklist' configuration option. The configuration option
+    prints more friendly messages than the 'tell' action of blacklists.
+
+1.1.2
+- Block lag fix: Snow and glass should no longer drop items.
+- Block lag fix: Block object now reset after hook call.
+
+1.1.1
+- Fixed redstone wire dropping wood blocks with the block lag fix.
+- The block lag fix now consults other plugins so that ALL protection
+    mechanisms and plugins should work.
+
+1.1
+- Added block lag fix.
+
+1.0
+- Initial release.

CONTRIBUTING.md

@@ -1,4 +1,5 @@
-# Contributing
+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

LICENSE.txt

@@ -1,3 +1,6 @@
+----------------------------------------------------------------------------
+WorldGuard License
+----------------------------------------------------------------------------
 
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
@@ -166,9 +169,8 @@ permanent authorization for you to choose that version for the
 Library.
 
 ----------------------------------------------------------------------------
-
-This work includes Robert Olofsson's Priority R-Tree implementation, for which
-its license is reproduced below.
+PRTree License
+----------------------------------------------------------------------------
 
 Copyright (c) 2008-2010 Robert Olofsson.
 All rights reserved. 

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

@@ -1,46 +1,38 @@
-# ![WorldGuard](http://static.sk89q.com/readme/worldguard-new.png)
+![WorldGuard](http://static.sk89q.com/readme/worldguard.png)
+==========
 
-WorldGuard lets you and players guard areas of land against griefers and undesirables, as well as tweak and disable various gameplay features of Minecraft.
+WorldGuard is a toolbox of various functions, useful for multiplayer servers, that lets you:
 
-* Block creeper and wither block damage, falling damage, etc.;
-* Disable fire spread, lava fire spread, ice formation, Endermen picking up blocks, etc.;
-* Blacklist certain items and blocks so they can't be used;
-* Warn moderators when certain items and blocks are used;
-* Protect areas of your world so only certain people can build in them;
-* Set areas where PVP, TNT, mob damage, and other features are disabled;
-* Protect your server from various 'exploits' like magical obsidian creation machines;
-* Disable, or enable, various Minecraft features, like sponges from classic;
-* Add useful commands like an immediate "STOP ALL FIRE SPREAD" command.
-* Enable only features you want! Everything is off by default.
+* 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 Lesser
-General Public License v3.
-
-Currently, Bukkit is required to use WorldGuard. You can get a release copy of WorldGuard from the [BukkitDev site](http://dev.bukkit.org/bukkit-plugins/worldguard/).
+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
-[Gradle](http://gradle.org). Detailed compilation information
-[can be found on the wiki](http://wiki.sk89q.com/wiki/WorldGuard/Development#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 Gradle.
+Dependencies are automatically handled by Maven.
 
 Contributing
 ------------
 
-We happily accept contributions, especially through pull requests on GitHub.
+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.
 
-Submissions must be licensed under the GNU Lesser General Public License v3.
+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
 -----
 
-* [Homepage](http://enginehub.org/worldguard)
+* [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://builds.enginehub.org)
-* [End-user documentation](http://wiki.sk89q.com/wiki/WorldGuard)
+* [Continuous integration](http://builds.enginehub.org) [![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)

build.gradle

@@ -1,131 +0,0 @@
-println """
-*******************************************
- You are building WorldGuard! 
-
- If you encounter trouble:
- 1) Read COMPILING.md if you haven't yet
- 2) Try running 'build' in a separate Gradle run
- 3) Use gradlew and not gradle
- 4) If you still need help, ask on IRC! irc.esper.net #sk89q
-
- Output files will be in [subproject]/build/libs
-*******************************************
-"""
-
-buildscript {
-    repositories {
-        mavenCentral()
-        maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
-    }
-
-    configurations.all {
-        resolutionStrategy {
-            force 'com.google.guava:guava:21.0'
-        }
-    }
-
-    dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.1'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1'
-        classpath 'org.ajoberstar:gradle-git:0.12.0'
-    }
-}
-
-if (!project.hasProperty("artifactory_contextUrl")) ext.artifactory_contextUrl = "http://localhost"
-if (!project.hasProperty("artifactory_user")) ext.artifactory_user = "guest"
-if (!project.hasProperty("artifactory_password")) ext.artifactory_password = ""
-
-if (!project.hasProperty("gitCommitHash")) {
-    try {
-        def repo = org.ajoberstar.grgit.Grgit.open(project.file('.'))
-        ext.gitCommitHash = repo.head().abbreviatedId
-    } catch (Exception e) {
-        ext.gitCommitHash = "no_git_id"
-    }
-}
-
-subprojects {
-    apply plugin: 'java'
-    apply plugin: 'maven'
-    apply plugin: 'checkstyle'
-    apply plugin: 'com.github.johnrengelman.shadow'
-    apply plugin: 'com.jfrog.artifactory-upload'
-
-    group = 'com.sk89q.worldguard'
-    version = '7.0.0-SNAPSHOT'
-    ext.internalVersion = version + ";" + gitCommitHash
-
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-
-    checkstyle.configFile = new File(rootProject.projectDir, "config/checkstyle/checkstyle.xml")
-
-    repositories {
-        mavenCentral()
-        maven { url "http://repo.spongepowered.org/maven/" }
-        maven { url "https://hub.spigotmc.org/nexus/content/groups/public" }
-        maven { url "http://maven.sk89q.com/repo/" }
-        maven { url "http://repo.maven.apache.org/maven2" }
-    }
-
-    if (JavaVersion.current().isJava8Compatible()) {
-        // Java 8 turns on doclint which we fail
-        tasks.withType(Javadoc) {
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
-    }
-
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
-
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
-        from javadoc.destinationDir
-    }
-
-    artifacts {
-        archives jar
-        archives sourcesJar
-        archives javadocJar
-    }
-
-    build.dependsOn(checkstyleMain)
-    build.dependsOn(checkstyleTest)
-    build.dependsOn(sourcesJar)
-    build.dependsOn(javadocJar)
-
-    shadowJar {
-        classifier 'dist'
-        dependencies {
-            include(dependency('org.khelekore:prtree:1.5.0'))
-        }
-        exclude 'GradleStart**'
-        exclude '.cache'
-        exclude 'LICENSE*'
-    }
-
-    artifactory {
-        contextUrl = "${artifactory_contextUrl}"
-        publish {
-            repository {
-                repoKey = project.version.contains("SNAPSHOT") ? 'libs-snapshot-local' : 'libs-release-local'
-                username = "${artifactory_user}"
-                password = "${artifactory_password}"
-                maven = true
-                
-            }
-        }
-
-        resolve {
-            repository {
-                repoKey = 'repo'
-                username = "${artifactory_user}"
-                password = "${artifactory_password}"
-                maven = true
-            }
-        }
-    }
-}

config/checkstyle/checkstyle.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-<module name="Checker">
-  <!-- Tabs are strictly banned -->
-  <module name="FileTabCharacter"/>
-
-  <module name="TreeWalker">
-    <!-- Important basics -->
-    <!-- <module name="PackageDeclaration"/> Unlikely that we would miss this in a PR -->
-    <module name="OuterTypeFilename"/> <!-- TypeName -> TypeName.java -->
-
-    <!--
-    Control package usage, so people don't insert Bukkit into WE where it shouldn't belong, etc.
-    It is a bit draconian, so update as necessary!
-    -->
-    <module name="ImportControl">
-      <property name="file" value="config/checkstyle/import-control.xml"/>
-    </module>
-
-    <!-- Code -->
-    <module name="HideUtilityClassConstructor"/> <!-- Utility classes should not have a constructor -->
-    <module name="CovariantEquals"/>
-    <module name="EqualsHashCode"/> <!-- equals() and hashCode() go together -->
-    <module name="NestedTryDepth"> <!-- SHOULD not need to adjust this -->
-      <property name="max" value="2"/>
-    </module>
-    <module name="SuperFinalize"/> <!-- We don't actually use this -->
-    <module name="JUnitTestCase"/> <!-- Checks tearDown(), setUp() etc. -->
-
-    <!-- Style -->
-    <module name="LeftCurly"> <!-- Left brace never goes on another line -->
-      <property name="option" value="eol"/>
-    </module> <!-- We don't check right brace -->
-    <module name="DefaultComesLast"/> <!-- default case in switch should be last -->
-    <module name="GenericWhitespace"/>
-
-    <!-- Naming -->
-    <module name="ClassTypeParameterName">
-      <property name="format" value="^[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module name="LocalFinalVariableName"/>
-    <module name="LocalVariableName">
-      <property name="format" value="^[a-z_][a-zA-Z0-9]*$"/>
-    </module>
-    <module name="MemberName">
-      <property name="format" value="^[a-z_][a-zA-Z0-9]*$"/>
-    </module>
-    <module name="MethodName">
-      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-    </module>
-    <!-- <module name="PackageName"/> Unlikely that we would miss this in a PR -->
-    <module name="ParameterName"/>
-    <!-- <module name="TypeName"/> Unlikely that we would miss this in a PR -->
-  </module>
-
-  <!-- Require the header, something that many people forget and we hate to fix -->
-  <!-- You should configure the header in your IDE -->
-  <module name="Header">
-    <property name="headerFile" value="config/checkstyle/header.txt"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-</module>

config/checkstyle/header.txt

@@ -1,18 +0,0 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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/>.
- */

config/checkstyle/import-control.xml

@@ -1,34 +0,0 @@
-<!DOCTYPE import-control PUBLIC
-    "-//Puppy Crawl//DTD Import Control 1.1//EN"
-    "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
-
-<import-control pkg="com.sk89q">
-  <allow pkg="java"/>
-  <allow pkg="javax"/>
-  <allow pkg="org.junit"/>
-  <allow pkg="org.hamcrest"/>
-  <allow pkg="org.mockito"/>
-  <allow pkg="com.sk89q"/>
-  <allow pkg="com.google.common"/>
-
-  <subpackage name="worldguard">
-    <allow pkg="org.khelekore"/>
-    <allow pkg="org.flywaydb"/>
-
-    <subpackage name="bukkit">
-      <allow pkg="org.bukkit"/>
-      <allow pkg="net.minecraft.server"/>
-    </subpackage>
-
-    <subpackage name="sponge">
-      <allow pkg="org.spongepowered"/>
-      <allow pkg="com.flowpowered"/>
-    </subpackage>
-
-    <subpackage name="forge">
-      <allow pkg="net.minecraft"/>
-      <allow pkg="net.minecraftforge"/>
-    </subpackage>
-  </subpackage>
-
-</import-control>

contrib/region_storage.sql

@@ -5,12 +5,13 @@ SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL';
 -- -----------------------------------------------------
 -- Table `group`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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;
 
@@ -18,12 +19,13 @@ COLLATE = utf8_bin;
 -- -----------------------------------------------------
 -- Table `world`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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;
 
@@ -31,7 +33,7 @@ COLLATE = utf8_bin;
 -- -----------------------------------------------------
 -- Table `region`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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 ,
@@ -40,14 +42,14 @@ CREATE  TABLE IF NOT EXISTS `${tablePrefix}region` (
   PRIMARY KEY (`id`, `world_id`) ,
   INDEX `fk_region_world` (`world_id` ASC) ,
   INDEX `parent` (`parent` ASC) ,
-  CONSTRAINT `fk_${tablePrefix}region_world1`
+  CONSTRAINT `fk_region_world1`
     FOREIGN KEY (`world_id` )
-    REFERENCES `${tablePrefix}world` (`id` )
+    REFERENCES `world` (`id` )
     ON DELETE CASCADE
     ON UPDATE CASCADE,
-  CONSTRAINT `${tablePrefix}parent`
+  CONSTRAINT `parent`
     FOREIGN KEY (`parent` )
-    REFERENCES `${tablePrefix}region` (`id` )
+    REFERENCES `region` (`id` )
     ON DELETE SET NULL
     ON UPDATE CASCADE)
 ENGINE = InnoDB
@@ -58,7 +60,7 @@ COLLATE = utf8_bin;
 -- -----------------------------------------------------
 -- Table `region_cuboid`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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 ,
@@ -69,9 +71,9 @@ CREATE  TABLE IF NOT EXISTS `${tablePrefix}region_cuboid` (
   `max_z` BIGINT(20) NOT NULL ,
   PRIMARY KEY (`region_id`, `world_id`) ,
   INDEX `fk_region_cuboid_region` (`region_id` ASC) ,
-  CONSTRAINT `fk_${tablePrefix}region_cuboid_region`
+  CONSTRAINT `fk_region_cuboid_region`
     FOREIGN KEY (`region_id` , `world_id` )
-    REFERENCES `${tablePrefix}region` (`id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
     ON DELETE CASCADE
     ON UPDATE CASCADE)
 ENGINE = InnoDB
@@ -82,7 +84,7 @@ COLLATE = utf8_bin;
 -- -----------------------------------------------------
 -- Table `region_flag`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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 ,
@@ -90,12 +92,13 @@ CREATE  TABLE IF NOT EXISTS `${tablePrefix}region_flag` (
   `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_${tablePrefix}flags_region`
+  CONSTRAINT `fk_flags_region`
     FOREIGN KEY (`region_id` , `world_id` )
-    REFERENCES `${tablePrefix}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;
 
@@ -103,7 +106,7 @@ COLLATE = utf8_bin;
 -- -----------------------------------------------------
 -- Table `region_groups`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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 ,
@@ -111,14 +114,14 @@ CREATE  TABLE IF NOT EXISTS `${tablePrefix}region_groups` (
   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_${tablePrefix}region_groups_group`
+  CONSTRAINT `fk_region_groups_group`
     FOREIGN KEY (`group_id` )
-    REFERENCES `${tablePrefix}group` (`id` )
+    REFERENCES `group` (`id` )
     ON DELETE CASCADE
     ON UPDATE CASCADE,
-  CONSTRAINT `fk_${tablePrefix}region_groups_region`
+  CONSTRAINT `fk_region_groups_region`
     FOREIGN KEY (`region_id` , `world_id` )
-    REFERENCES `${tablePrefix}region` (`id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
     ON DELETE CASCADE
     ON UPDATE CASCADE)
 ENGINE = InnoDB
@@ -129,12 +132,13 @@ COLLATE = utf8_bin;
 -- -----------------------------------------------------
 -- Table `user`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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;
 
@@ -142,7 +146,7 @@ COLLATE = utf8_bin;
 -- -----------------------------------------------------
 -- Table `region_players`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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 ,
@@ -150,14 +154,14 @@ CREATE  TABLE IF NOT EXISTS `${tablePrefix}region_players` (
   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_${tablePrefix}region_users_region`
+  CONSTRAINT `fk_region_users_region`
     FOREIGN KEY (`region_id` , `world_id` )
-    REFERENCES `${tablePrefix}region` (`id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
     ON DELETE CASCADE
     ON UPDATE CASCADE,
-  CONSTRAINT `fk_${tablePrefix}region_users_user`
+  CONSTRAINT `fk_region_users_user`
     FOREIGN KEY (`user_id` )
-    REFERENCES `${tablePrefix}user` (`id` )
+    REFERENCES `user` (`id` )
     ON DELETE CASCADE
     ON UPDATE CASCADE)
 ENGINE = InnoDB
@@ -168,16 +172,16 @@ COLLATE = utf8_bin;
 -- -----------------------------------------------------
 -- Table `region_poly2d`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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_${tablePrefix}region_poly2d_region`
+  CONSTRAINT `fk_region_poly2d_region`
     FOREIGN KEY (`region_id` , `world_id` )
-    REFERENCES `${tablePrefix}region` (`id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
     ON DELETE CASCADE
     ON UPDATE CASCADE)
 ENGINE = InnoDB
@@ -188,7 +192,7 @@ COLLATE = utf8_bin;
 -- -----------------------------------------------------
 -- Table `region_poly2d_point`
 -- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `${tablePrefix}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 ,
@@ -196,12 +200,13 @@ CREATE  TABLE IF NOT EXISTS `${tablePrefix}region_poly2d_point` (
   `z` BIGINT(20) NOT NULL ,
   PRIMARY KEY (`id`) ,
   INDEX `fk_region_poly2d_point_region_poly2d` (`region_id` ASC, `world_id` ASC) ,
-  CONSTRAINT `fk_${tablePrefix}region_poly2d_point_region_poly2d`
+  CONSTRAINT `fk_region_poly2d_point_region_poly2d`
     FOREIGN KEY (`region_id` , `world_id` )
-    REFERENCES `${tablePrefix}region_poly2d` (`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;
 

contrib/region_storage_update_20110325.sql

@@ -1,11 +1,3 @@
---
--- This file only needs to be run if you are using a very old version
--- of the region database (before 2011/03/25).
---
--- Otherwise, WG knows how to update your tables automatically, as well
--- as set them up initially.
---
-
 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';

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Fri Nov 13 12:12:21 EST 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

gradlew

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

pom.xml

@@ -0,0 +1,327 @@
+<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.9.1-SNAPSHOT</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>master</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>
+    <repository>
+      <id>maven.sk89q.com</id>
+      <url>http://maven.sk89q.com/artifactory/libs-release-local</url>
+    </repository>
+    <snapshotRepository>
+      <id>maven.sk89q.com-snapshot</id>
+      <url>http://maven.sk89q.com/artifactory/libs-snapshot-local</url>
+    </snapshotRepository>
+  </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.8</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.7.2-R0.3</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>commandbook</artifactId>
+      <version>2.3</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>

settings.gradle

@@ -1,3 +0,0 @@
-rootProject.name = 'worldguard'
-
-include 'worldguard-core', 'worldguard-sponge', 'worldguard-legacy'

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

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

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

@@ -0,0 +1,334 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist;
+
+import java.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.Map;
+import java.util.logging.Level;
+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;
+
+/**
+ *
+ * @author sk89q
+ */
+public abstract class Blacklist {
+
+    /**
+     * List of entries by block ID.
+     */
+    private Map<Integer,List<BlacklistEntry>> blacklist
+            = new HashMap<Integer,List<BlacklistEntry>>();
+    /**
+     * Logger.
+     */
+    private BlacklistLogger blacklistLogger = new BlacklistLogger();
+    /**
+     * Last event.
+     */
+    private BlacklistEvent lastEvent;
+    /**
+     * Used to prevent flooding.
+     */
+    Map<String,BlacklistTrackedEvent> lastAffected =
+            new HashMap<String,BlacklistTrackedEvent>();
+
+    private 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 whether the blacklist is empty
+     */
+    public boolean isEmpty() {
+        return blacklist.isEmpty();
+    }
+
+    /**
+     * Get the entries for an item or list.
+     *
+     * @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 The number of items in the blacklist
+     */
+    public int getItemCount() {
+        return blacklist.size();
+    }
+
+    /**
+     * Returns whether the blacklist is used as a whitelist.
+     *
+     * @return whether the blacklist is be used as a whitelist
+     */
+    public boolean isWhitelist() {
+        return useAsWhitelist;
+    }
+
+    /**
+     * Get the logger.
+     *
+     * @return The logger used in this blacklist
+     */
+    public BlacklistLogger getLogger() {
+        return blacklistLogger;
+    }
+
+    /**
+     * Method to handle the event.
+     *
+     * @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());
+        if (entries == null) {
+            return true;
+        }
+        boolean ret = true;
+        for (BlacklistEntry entry : entries) {
+            if (!entry.check(useAsWhitelist, event, forceRepeat, silent)) {
+                ret = false;
+            }
+        }
+        return ret;
+    }
+
+    /**
+     * Load the blacklist.
+     *
+     * @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;
+        Map<Integer,List<BlacklistEntry>> blacklist =
+                new HashMap<Integer,List<BlacklistEntry>>();
+
+        try {
+            input = new FileReader(file);
+            BufferedReader buff = new BufferedReader(input);
+
+            String line;
+            List<BlacklistEntry> currentEntries = null;
+            while ((line = buff.readLine()) != null) {
+                line = line.trim();
+
+                // Blank line
+                if (line.length() == 0) {
+                    continue;
+                } else if (line.charAt(0) == ';' || line.charAt(0) == '#') {
+                    continue;
+                }
+
+                if (line.matches("^\\[.*\\]$")) {
+                    String[] items = line.substring(1, line.length() - 1).split(",");
+                    currentEntries = new ArrayList<BlacklistEntry>();
+
+                    for (String item : items) {
+                        int id;
+
+                        try {
+                            id = Integer.parseInt(item.trim());
+                        } catch (NumberFormatException e) {
+                            id = getItemID(item.trim());
+                            if (id == 0) {
+                                logger.log(Level.WARNING, "Unknown block name: "
+                                        + item);
+                                break;
+                            }
+                        }
+
+                        BlacklistEntry entry = new BlacklistEntry(this);
+                        if (blacklist.containsKey(id)) {
+                            blacklist.get(id).add(entry);
+                        } else {
+                            List<BlacklistEntry> entries = new ArrayList<BlacklistEntry>();
+                            entries.add(entry);
+                            blacklist.put(id, entries);
+                        }
+                        currentEntries.add(entry);
+                    }
+                } else if (currentEntries != null) {
+                    String[] parts = line.split("=");
+
+                    if (parts.length == 1) {
+                        logger.log(Level.WARNING, "Found option with no value "
+                                + file.getName() + " for '" + line + "'");
+                        continue;
+                    }
+
+                    boolean unknownOption = false;
+
+                    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")) {
+                            entry.setDestroyWithActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("on-place")) {
+                            entry.setPlaceActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("on-interact")) {
+                            entry.setInteractActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("on-use")) {
+                            entry.setUseActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("on-drop")) {
+                            entry.setDropActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("on-acquire")) {
+                            entry.setAcquireActions(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("message")) {
+                            entry.setMessage(parts[1].trim());
+                        } else if (parts[0].equalsIgnoreCase("comment")) {
+                            entry.setComment(parts[1].trim());
+                        } else {
+                            unknownOption = true;
+                        }
+                    }
+
+                    if (unknownOption) {
+                        logger.log(Level.WARNING, "Unknown option '" + parts[0]
+                                + "' in " + file.getName() + " for '" + line + "'");
+                    }
+                } else {
+                    logger.log(Level.WARNING, "Found option with no heading "
+                            + file.getName() + " for '" + line + "'");
+                }
+            }
+
+            this.blacklist = blacklist;
+        } finally {
+            try {
+                if (input != null) {
+                    input.close();
+                }
+            } catch (IOException ignore) {
+            }
+        }
+    }
+
+    /**
+     * Get the last event.
+     *
+     * @return The last event
+     */
+    public BlacklistEvent getLastEvent() {
+        return lastEvent;
+    }
+
+    /**
+     * Notify administrators.
+     *
+     * @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: "
+                + 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 The message to broadcast
+     */
+    public abstract void broadcastNotification(String msg);
+
+    /**
+     * Forget a player.
+     *
+     * @param player The player to forget
+     */
+    public void forgetPlayer(LocalPlayer player) {
+        lastAffected.remove(player.getName());
+    }
+
+    /**
+     * Forget all players.
+     */
+    public void forgetAllPlayers() {
+        lastAffected.clear();
+    }
+
+    /**
+     * Get an item's ID from its 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);
+        if (type != null) {
+            return type.getID();
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     * Get an item's friendly name with its 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);
+        if (type != null) {
+            return type.getName() + " (#" + id + ")";
+        } else {
+            return "#" + id + "";
+        }
+    }
+}

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

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

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

@@ -1,44 +1,47 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * 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 Lesser General Public License
- * for more details.
+ * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 package com.sk89q.worldguard.blacklist;
 
-import com.sk89q.worldguard.blacklist.event.BlacklistEvent;
-import com.sk89q.worldguard.blacklist.logger.LoggerHandler;
-
 import java.util.HashSet;
 import java.util.Set;
 
-public class BlacklistLoggerHandler implements LoggerHandler {
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+import com.sk89q.worldguard.blacklist.loggers.BlacklistLoggerHandler;
 
+/**
+ *
+ * @author sk89q
+ */
+public class BlacklistLogger implements BlacklistLoggerHandler {
     /**
      * List of logger handlers.
      */
-    private Set<LoggerHandler> handlers
-            = new HashSet<LoggerHandler>();
+    private Set<BlacklistLoggerHandler> handlers
+            = new HashSet<BlacklistLoggerHandler>();
 
     /**
      * Add a handler.
      *
      * @param handler The handler to add
      */
-    public void addHandler(LoggerHandler handler) {
+    public void addHandler(BlacklistLoggerHandler handler) {
         handlers.add(handler);
     }
 
@@ -47,7 +50,7 @@ public class BlacklistLoggerHandler implements LoggerHandler {
      *
      * @param handler The handler to remove
      */
-    public void removeHandler(LoggerHandler handler) {
+    public void removeHandler(BlacklistLoggerHandler handler) {
         handlers.remove(handler);
     }
 
@@ -63,9 +66,8 @@ public class BlacklistLoggerHandler implements LoggerHandler {
      *
      * @param event The event to log
      */
-    @Override
     public void logEvent(BlacklistEvent event, String comment) {
-        for (LoggerHandler handler : handlers) {
+        for (BlacklistLoggerHandler handler : handlers) {
             handler.logEvent(event, comment);
         }
     }
@@ -73,11 +75,9 @@ public class BlacklistLoggerHandler implements LoggerHandler {
     /**
      * Close the connection.
      */
-    @Override
     public void close() {
-        for (LoggerHandler handler : handlers) {
+        for (BlacklistLoggerHandler handler : handlers) {
             handler.close();
         }
     }
-
 }

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

@@ -0,0 +1,48 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist;
+
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+
+/**
+ *
+ * @author sk89q
+ */
+public class BlacklistTrackedEvent {
+    private BlacklistEvent event;
+    private long time;
+
+    /**
+     * Construct the object.
+     *
+     * @param event The event tracked
+     * @param time The time at which the event occurred
+     */
+    public BlacklistTrackedEvent(BlacklistEvent event, long time) {
+        this.event = event;
+        this.time = time;
+    }
+
+    public boolean matches(BlacklistEvent other, long now) {
+        return other.getType() == event.getType()
+                && time > now - 3000
+                && other.getClass() == event.getClass();
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,42 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.loggers;
+
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+
+/**
+ * Interface for loggers for the blacklist.
+ *
+ * @author sk89q
+ */
+public interface BlacklistLoggerHandler {
+    /**
+     * Log an event.
+     *
+     * @param event
+     * @param comment
+     */
+    public void logEvent(BlacklistEvent event, String comment);
+
+    /**
+     * Close the logger.
+     */
+    public void close();
+}

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

@@ -0,0 +1,128 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.loggers;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.sk89q.worldedit.blocks.ItemType;
+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 {
+
+
+    private String worldName;
+	
+    private final Logger logger;
+
+    public ConsoleLoggerHandler(String worldName, Logger logger) {
+        this.worldName = worldName;
+	    this.logger = logger;
+    }
+
+    public void logEvent(BlacklistEvent event, String comment) {
+        // Block break
+        if (event instanceof BlockBreakBlacklistEvent) {
+            BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
+            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, "[" + 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, "[" + 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, "[" + 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, "[" + 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, "[" + 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, "[" + worldName + "] " + event.getPlayer().getName()
+                    + " tried to use " + getFriendlyItemName(evt.getType())
+                    + (comment != null ? " (" + comment + ")" : ""));
+
+        // Unknown
+        } else {
+            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 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;
+        }
+    }
+
+    /**
+     * Close the connection.
+     */
+    public void close() {
+    }
+}

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

@@ -0,0 +1,205 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.blacklist.loggers;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+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;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+
+/**
+ *
+ * @author sk89q
+ */
+public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
+
+    /**
+     * DSN.
+     */
+    private final String dsn;
+    /**
+     * Username.
+     */
+    private final String user;
+    /**
+     * Password.
+     */
+    private final String pass;
+    /**
+     * Table.
+     */
+    private final String table;
+    /**
+     * World name.
+     */
+    private final String worldName;
+    /**
+     * Database connection.
+     */
+    private Connection conn;
+    
+    private final Logger logger;
+
+    /**
+     * Construct the object.
+     *
+     * @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, 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 The database connection
+     * @throws SQLException when the connection cannot be created
+     */
+    private Connection getConnection() throws SQLException {
+        if (conn == null || conn.isClosed()) {
+            conn = DriverManager.getConnection(dsn, user, pass);
+        }
+        return conn;
+    }
+
+    /**
+     * Log an event to the database.
+     *
+     * @param event 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) {
+        try {
+            Connection conn = getConnection();
+            PreparedStatement stmt = conn.prepareStatement(
+                    "INSERT INTO " + table
+                  + "(event, world, player, x, y, z, item, time, comment) VALUES "
+                  + "(?, ?, ?, ?, ?, ?, ?, ?, ?)");
+            stmt.setString(1, event);
+            stmt.setString(2, worldName);
+            stmt.setString(3, player.getName());
+            stmt.setInt(4, pos.getBlockX());
+            stmt.setInt(5, pos.getBlockY());
+            stmt.setInt(6, pos.getBlockZ());
+            stmt.setInt(7, item);
+            stmt.setInt(8, (int)(System.currentTimeMillis() / 1000));
+            stmt.setString(9, comment);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            logger.log(Level.SEVERE, "Failed to log blacklist event to database: "
+                    + e.getMessage());
+        }
+    }
+
+    /**
+     * Log an 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("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 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(),
+                    -1, comment);
+        }
+    }
+
+    /**
+     * Close the connection.
+     */
+    public void close() {
+        try {
+            if (conn != null && !conn.isClosed()) {
+                conn.close();
+            }
+        } catch (SQLException ignore) {
+
+        }
+    }
+}

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

@@ -1,29 +1,23 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * 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 Lesser General Public License
- * for more details.
+ * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
-package com.sk89q.worldguard.blacklist.logger;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.event.BlacklistEvent;
-import com.sk89q.worldguard.blacklist.target.Target;
+package com.sk89q.worldguard.blacklist.loggers;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -41,26 +35,54 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class FileHandler implements LoggerHandler {
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.ItemType;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 
+/**
+ *
+ * @author sk89q
+ */
+public class FileLoggerHandler implements BlacklistLoggerHandler {
+    /**
+     * Regex for patterns in the path.
+     */
     private static Pattern pattern = Pattern.compile("%.");
-    private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    /**
+     * Date format.
+     */
+    private static SimpleDateFormat dateFormat =
+            new SimpleDateFormat("yyyyy-MM-dd HH:mm:ss");
 
+    /**
+     * Number of files to keep open at a time.
+     */
     private int cacheSize = 10;
+    /**
+     * Path pattern.
+     */
     private String pathPattern;
+    /**
+     * World name.
+     */
     private String worldName;
-    private TreeMap<String,LogFileWriter> writers = new TreeMap<String,LogFileWriter>();
+    /**
+     * Cache of writers.
+     */
+    private TreeMap<String,FileLoggerWriter> writers =
+            new TreeMap<String,FileLoggerWriter>();
     
     private final Logger logger;
 
     /**
      * Construct the object.
      *
-     * @param pathPattern The pattern for the log file path
+     * @param pathPattern The pattern for the logflie path
      * @param worldName The name of the world
      * @param logger The logger used to log errors
      */
-    public FileHandler(String pathPattern, String worldName, Logger logger) {
+    public FileLoggerHandler(String pathPattern, String worldName, Logger logger) {
         this.pathPattern = pathPattern;
         this.worldName = worldName;
         this.logger = logger;
@@ -74,7 +96,7 @@ public class FileHandler implements LoggerHandler {
      * @param worldName The name of the associated world
      * @param logger The logger to log errors with
      */
-    public FileHandler(String pathPattern, int cacheSize, String worldName, Logger logger) {
+    public FileLoggerHandler(String pathPattern, int cacheSize, String worldName, Logger logger) {
         if (cacheSize < 1) {
             throw new IllegalArgumentException("Cache size cannot be less than 1");
         }
@@ -87,7 +109,7 @@ public class FileHandler implements LoggerHandler {
     /**
      * Build the path.
      *
-     * @param playerName The name of the player
+     * @param playerName The name of the playername
      * @return The path for the logfile
      */
     private String buildPath(String playerName) {
@@ -156,7 +178,7 @@ public class FileHandler implements LoggerHandler {
             String line = "[" + date + "] " + player.getName() + ": " + message
                     + (comment != null ? " (" + comment + ")" : "") + "\r\n";
 
-            LogFileWriter writer = writers.get(path);
+            FileLoggerWriter writer = writers.get(path);
 
             // Writer already exists!
             if (writer != null) {
@@ -182,17 +204,17 @@ public class FileHandler implements LoggerHandler {
             BufferedWriter out = new BufferedWriter(stream);
             out.write(line);
             out.flush();
-            writer = new LogFileWriter(path, out);
+            writer = new FileLoggerWriter(path, out);
             writers.put(path, writer);
 
             // Check to make sure our cache doesn't get too big!
             if (writers.size() > cacheSize) {
-                Iterator<Map.Entry<String,LogFileWriter>> it =
+                Iterator<Map.Entry<String,FileLoggerWriter>> it =
                         writers.entrySet().iterator();
 
                 // Remove some entries
                 for (; it.hasNext(); ) {
-                    Map.Entry<String,LogFileWriter> entry = it.next();
+                    Map.Entry<String,FileLoggerWriter> entry = it.next();
                     try {
                         entry.getValue().getWriter().close();
                     } catch (IOException ignore) {
@@ -222,13 +244,18 @@ public class FileHandler implements LoggerHandler {
         return "@" + pos.getBlockX() + "," + pos.getBlockY() + "," + pos.getBlockZ();
     }
 
-    private void logEvent(BlacklistEvent event, String text, Target target, Vector pos, String comment) {
-        log(event.getPlayer(), "Tried to " + text + " " + target.getFriendlyName() + " " + getCoordinates(pos), comment);
+    private void logEvent(BlacklistEvent event, String text, int id, Vector pos, String comment) {
+        log(event.getPlayer(), "Tried to " + text + " " + getFriendlyItemName(id)
+                + " " + getCoordinates(pos), comment);
     }
 
-    @Override
+    /**
+     * Log an event.
+     *
+     * @param event The event to log
+     */
     public void logEvent(BlacklistEvent event, String comment) {
-        logEvent(event, event.getDescription(), event.getTarget(), event.getPosition(), comment);
+        logEvent(event, event.getDescription(), event.getType(), event.getPosition(), comment);
     }
 
     /**
@@ -246,9 +273,11 @@ public class FileHandler implements LoggerHandler {
         }
     }
 
-    @Override
+    /**
+     * Close handles.
+     */
     public void close() {
-        for (Map.Entry<String,LogFileWriter> entry : writers.entrySet()) {
+        for (Map.Entry<String,FileLoggerWriter> entry : writers.entrySet()) {
             try {
                 entry.getValue().getWriter().close();
             } catch (IOException ignore) {
@@ -257,5 +286,4 @@ public class FileHandler implements LoggerHandler {
 
         writers.clear();
     }
-
 }

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

@@ -1,31 +1,42 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * 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 Lesser General Public License
- * for more details.
+ * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
-package com.sk89q.worldguard.blacklist.logger;
+package com.sk89q.worldguard.blacklist.loggers;
 
-import javax.annotation.Nullable;
 import java.io.BufferedWriter;
 
-public class LogFileWriter implements Comparable<LogFileWriter> {
-
+/**
+ *
+ * @author sk89q
+ */
+public class FileLoggerWriter implements Comparable<FileLoggerWriter> {
+    /**
+     * Path.
+     */
     public String path;
+    /**
+     * Writer.
+     */
     private BufferedWriter writer;
+    /**
+     * Last use.
+     */
     private long lastUse;
 
     /**
@@ -34,7 +45,7 @@ public class LogFileWriter implements Comparable<LogFileWriter> {
      * @param path The path to write to
      * @param writer The writer for the file
      */
-    public LogFileWriter(String path, BufferedWriter writer) {
+    public FileLoggerWriter(String path, BufferedWriter writer) {
         this.path = path;
         this.writer = writer;
         lastUse = System.currentTimeMillis();
@@ -70,11 +81,8 @@ public class LogFileWriter implements Comparable<LogFileWriter> {
         lastUse = System.currentTimeMillis();
     }
 
-    @Override
-    public int compareTo(@Nullable LogFileWriter other) {
-        if (other == null) {
-            return 1;
-        } else if (lastUse > other.lastUse) {
+    public int compareTo(FileLoggerWriter other) {
+        if (lastUse > other.lastUse) {
             return 1;
         } else if (lastUse < other.lastUse) {
             return -1;
@@ -82,5 +90,4 @@ public class LogFileWriter implements Comparable<LogFileWriter> {
             return 0;
         }
     }
-
 }

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

@@ -1,27 +1,25 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Foundation, either version 3 of the License, or
+ * 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.
+ * 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/>.
- */
+ * 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.permission;
+package com.sk89q.worldguard.bukkit;
 
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import org.bukkit.command.CommandSender;
-import com.sk89q.worldguard.internal.PermissionModel;
+import org.enginehub.util.PermissionModel;
 
 abstract class AbstractPermissionModel implements PermissionModel {
     

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

@@ -0,0 +1,36 @@
+// $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;
+
+public class BukkitBlacklist extends Blacklist {
+    private WorldGuardPlugin plugin;
+    
+    public BukkitBlacklist(Boolean useAsWhitelist, WorldGuardPlugin plugin) {
+        super(useAsWhitelist, plugin.getLogger());
+        this.plugin = plugin;
+    }
+    
+    @Override
+    public void broadcastNotification(String msg) {
+        plugin.broadcastNotification(msg);
+    }
+}

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

@@ -0,0 +1,78 @@
+// $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.entity.Player;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class BukkitPlayer extends LocalPlayer {
+    private Player player;
+    private WorldGuardPlugin plugin;
+    
+    public BukkitPlayer(WorldGuardPlugin plugin, Player player) {
+        this.plugin = plugin;
+        this.player = player;
+    }
+
+    @Override
+    public String getName() {
+        return player.getName();
+    }
+
+    @Override
+    public boolean hasGroup(String group) {
+        return plugin.inGroup(player, group);
+    }
+
+    @Override
+    public Vector getPosition() {
+        Location loc = player.getLocation();
+        return new Vector(loc.getX(), loc.getY(), loc.getZ());
+    }
+
+    @Override
+    public void kick(String msg) {
+        player.kickPlayer(msg);
+    }
+
+    @Override
+    public void ban(String msg) {
+        player.setBanned(true);
+        player.kickPlayer(msg);
+    }
+
+    @Override
+    public String[] getGroups() {
+        return plugin.getGroups(player);
+    }
+
+    @Override
+    public void printRaw(String msg) {
+        player.sendMessage(msg);
+    }
+
+    @Override
+    public boolean hasPermission(String perm) {
+        return plugin.hasPermission(player, perm);
+    }
+}

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

@@ -1,408 +1,297 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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 com.google.common.collect.ImmutableList;
-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 com.sk89q.worldguard.blacklist.target.MaterialTarget;
-import com.sk89q.worldguard.blacklist.target.Target;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import com.sk89q.worldguard.util.Enums;
-import org.bukkit.*;
-import org.bukkit.block.Block;
-import org.bukkit.entity.*;
-import org.bukkit.inventory.ItemStack;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public class BukkitUtil {
-
-    private static Method ONLINE_PLAYERS_METHOD;
-
-    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());
-    }
-
-    /**
-     * Create a dummy region that encompasses the size of a chunk.
-     *
-     * @param chunk The chunk
-     * @return The dummy region
-     */
-    public static ProtectedRegion toRegion(Chunk chunk) {
-        World world = chunk.getWorld();
-
-        int minX = chunk.getX() << 4;
-        int minZ = chunk.getZ() << 4;
-        return new ProtectedCuboidRegion("_", new BlockVector(minX, 0, minZ), new BlockVector(minX + 15, world.getMaxHeight(), minZ + 15));
-    }
-
-    /**
-     * 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());
-
-        str = str.replace("&k", ChatColor.MAGIC.toString());
-        str = str.replace("&l", ChatColor.BOLD.toString());
-        str = str.replace("&m", ChatColor.STRIKETHROUGH.toString());
-        str = str.replace("&n", ChatColor.UNDERLINE.toString());
-        str = str.replace("&o", ChatColor.ITALIC.toString());
-
-        str = str.replace("&x", ChatColor.RESET.toString());
-
-        return str;
-    }
-
-    private static final org.bukkit.entity.EntityType armorStandType =
-        Enums.findByValue(org.bukkit.entity.EntityType.class, "ARMOR_STAND");
-
-    /**
-     * 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 FallingBlock
-                || (entity instanceof LivingEntity
-                    && !(entity instanceof Tameable)
-                    && !(entity instanceof Player)
-                    && !(entity.getType() == armorStandType));
-    }
-
-    /**
-     * 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
-     * @deprecated use {@link Enums#findByValue(Class, String...)}
-     */
-    @Deprecated
-    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;
-    }
-
-    /**
-     * Get a blacklist target for the given block.
-     *
-     * @param block the block
-     * @return a target
-     */
-    public static Target createTarget(Block block) {
-        checkNotNull(block);
-        return new MaterialTarget(block.getTypeId(), block.getData());
-    }
-
-    /**
-     * Get a blacklist target for the given block.
-     *
-     * @param block the block
-     * @param material a fallback material
-     * @return a target
-     */
-    public static Target createTarget(Block block, Material material) {
-        checkNotNull(material);
-        if (block.getType() == material) {
-            return new MaterialTarget(block.getTypeId(), block.getData());
-        } else {
-            return new MaterialTarget(material.getId(), (short) 0);
-        }
-    }
-
-    /**
-     * Get a blacklist target for the given item.
-     *
-     * @param item the item
-     * @return a target
-     */
-    public static Target createTarget(ItemStack item) {
-        checkNotNull(item);
-        return new MaterialTarget(item.getTypeId(), item.getDurability());
-    }
-
-    /**
-     * Get a blacklist target for the given material.
-     *
-     * @param material the material
-     * @return a target
-     */
-    public static Target createTarget(Material material) {
-        checkNotNull(material);
-        return new MaterialTarget(material.getId(), (short) 0);
-    }
-
-    /**
-     * Get a collection of the currently online players.
-     *
-     * @return The online players
-     */
-    @SuppressWarnings("unchecked")
-    public static Collection<? extends Player> getOnlinePlayers() {
-        try {
-            return Bukkit.getServer().getOnlinePlayers();
-        } catch (NoSuchMethodError ignored) {
-        }
-
-        try {
-            if (ONLINE_PLAYERS_METHOD == null) {
-                ONLINE_PLAYERS_METHOD = getOnlinePlayersMethod();
-            }
-
-            Object result = ONLINE_PLAYERS_METHOD.invoke(Bukkit.getServer());
-            if (result instanceof Player[]) {
-                return ImmutableList.copyOf((Player[]) result);
-            } else if (result instanceof Collection<?>) {
-                return (Collection<? extends Player>) result;
-            } else {
-                throw new RuntimeException("Result of getOnlinePlayers() call was not a known data type");
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("WorldGuard is not compatible with this version of Bukkit", e);
-        }
-    }
-
-    private static Method getOnlinePlayersMethod() throws NoSuchMethodException {
-        try {
-            return Server.class.getMethod("getOnlinePlayers");
-        } catch (NoSuchMethodException e1) {
-            return Server.class.getMethod("_INVALID_getOnlinePlayers");
-        }
-    }
-
-}
+// $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.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.ExperienceOrb;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.Player;
+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());
+
+        str = str.replace("&k", ChatColor.MAGIC.toString());
+        str = str.replace("&l", ChatColor.BOLD.toString());
+        str = str.replace("&m", ChatColor.STRIKETHROUGH.toString());
+        str = str.replace("&n", ChatColor.UNDERLINE.toString());
+        str = str.replace("&o", ChatColor.ITALIC.toString());
+
+        str = str.replace("&x", ChatColor.RESET.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 FallingBlock
+                || (entity instanceof LivingEntity
+                    && !(entity instanceof Tameable)
+                    && !(entity instanceof Player));
+    }
+
+    /**
+     * 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

@@ -1,44 +1,40 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * 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 Lesser General Public License
- * for more details.
+ * 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 Lesser General Public License
+ * 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.google.common.collect.ImmutableMap;
+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.protection.managers.storage.DriverType;
-import com.sk89q.worldguard.protection.managers.storage.RegionDriver;
-import com.sk89q.worldguard.protection.managers.storage.file.DirectoryYamlDriver;
-import com.sk89q.worldguard.protection.managers.storage.sql.SQLDriver;
-import com.sk89q.worldguard.session.handler.WaterBreathing;
-import com.sk89q.worldguard.util.report.Unreported;
-import com.sk89q.worldguard.util.sql.DataSourceConfig;
+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;
-import java.util.logging.Logger;
 
 /**
  * Represents the global configuration and also delegates configuration
@@ -49,8 +45,6 @@ import java.util.logging.Logger;
  */
 public class ConfigurationManager {
 
-    private static final Logger log = Logger.getLogger(ConfigurationManager.class.getCanonicalName());
-
     private static final String CONFIG_HEADER = "#\r\n" +
             "# WorldGuard's main configuration file\r\n" +
             "#\r\n" +
@@ -72,32 +66,51 @@ public class ConfigurationManager {
             "# - Lines starting with # are comments and so they are ignored.\r\n" +
             "#\r\n";
 
-    @Unreported private WorldGuardPlugin plugin;
-    @Unreported private ConcurrentMap<String, WorldConfiguration> worlds;
-    @Unreported private YAMLProcessor config;
+    /**
+     * 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 useGodPermission;
-    public boolean useGodGroup;
-    public boolean useAmphibiousGroup;
+    public boolean autoGodMode;
     public boolean usePlayerMove;
     public boolean usePlayerTeleports;
     public boolean deopOnJoin;
     public boolean blockInGameOp;
-    public boolean migrateRegionsToUuid;
-    public boolean keepUnresolvedNames;
-
-    @Unreported public Map<String, String> hostKeys = new HashMap<String, String>();
-    public boolean hostKeysAllowFMLClients;
+    public Map<String, String> hostKeys = new HashMap<String, String>();
 
     /**
      * Region Storage Configuration method, and config values
      */
-    @Unreported public RegionDriver selectedRegionStoreDriver;
-    @Unreported public Map<DriverType, RegionDriver> regionStoreDriverMap;
+    public boolean useSqlDatabase = false;
+    public String sqlDsn;
+    public String sqlUsername;
+    public String sqlPassword;
 
     /**
      * Construct the object.
@@ -109,25 +122,6 @@ public class ConfigurationManager {
         this.worlds = new ConcurrentHashMap<String, WorldConfiguration>();
     }
 
-    /**
-     * Get the folder for storing data files and configuration.
-     *
-     * @return the data folder
-     */
-    public File getDataFolder() {
-        return plugin.getDataFolder();
-    }
-
-    /**
-     * Get the folder for storing data files and configuration for each
-     * world.
-     *
-     * @return the data folder
-     */
-    public File getWorldsDataFolder() {
-        return new File(getDataFolder(), "worlds");
-    }
-
     /**
      * Load the configuration.
      */
@@ -141,17 +135,14 @@ public class ConfigurationManager {
         try {
             config.load();
         } catch (IOException e) {
-            log.severe("Error reading configuration for global config: ");
+            plugin.getLogger().severe("Error reading configuration for global config: ");
             e.printStackTrace();
         }
 
         config.removeProperty("suppress-tick-sync-warnings");
-        migrateRegionsToUuid = config.getBoolean("regions.uuid-migration.perform-on-next-start", true);
-        keepUnresolvedNames = config.getBoolean("regions.uuid-migration.keep-names-that-lack-uuids", true);
+        useRegionsScheduler = config.getBoolean("regions.use-scheduler", true);
         useRegionsCreatureSpawnEvent = config.getBoolean("regions.use-creature-spawn-event", true);
-        useGodPermission = config.getBoolean("auto-invincible", config.getBoolean("auto-invincible-permission", false));
-        useGodGroup = config.getBoolean("auto-invincible-group", false);
-        useAmphibiousGroup = config.getBoolean("auto-no-drowning-group", false);
+        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);
@@ -170,27 +161,13 @@ public class ConfigurationManager {
                 hostKeys.put(key.toLowerCase(), value);
             }
         }
-        hostKeysAllowFMLClients = config.getBoolean("security.host-keys-allow-forge-clients", false);
 
-        // ====================================================================
-        // Region store drivers
-        // ====================================================================
+        useSqlDatabase = config.getBoolean(
+                "regions.sql.use", false);
 
-        boolean useSqlDatabase = config.getBoolean("regions.sql.use", false);
-        String sqlDsn = config.getString("regions.sql.dsn", "jdbc:mysql://localhost/worldguard");
-        String sqlUsername = config.getString("regions.sql.username", "worldguard");
-        String sqlPassword = config.getString("regions.sql.password", "worldguard");
-        String sqlTablePrefix = config.getString("regions.sql.table-prefix", "");
-
-        DataSourceConfig dataSourceConfig = new DataSourceConfig(sqlDsn, sqlUsername, sqlPassword, sqlTablePrefix);
-        SQLDriver sqlDriver = new SQLDriver(dataSourceConfig);
-        DirectoryYamlDriver yamlDriver = new DirectoryYamlDriver(getWorldsDataFolder(), "regions.yml");
-
-        this.regionStoreDriverMap = ImmutableMap.<DriverType, RegionDriver>builder()
-                .put(DriverType.MYSQL, sqlDriver)
-                .put(DriverType.YAML, yamlDriver)
-                .build();
-        this.selectedRegionStoreDriver = useSqlDatabase ? sqlDriver : yamlDriver;
+        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()) {
@@ -198,6 +175,10 @@ public class ConfigurationManager {
         }
 
         config.setHeader(CONFIG_HEADER);
+
+        if (!config.save()) {
+            plugin.getLogger().severe("Error saving configuration!");
+        }
     }
 
     /**
@@ -207,13 +188,6 @@ public class ConfigurationManager {
         worlds.clear();
     }
 
-    public void disableUuidMigration() {
-        config.setProperty("regions.uuid-migration.perform-on-next-start", false);
-        if (!config.save()) {
-            log.severe("Error saving configuration!");
-        }
-    }
-
     /**
      * Get the configuration for a world.
      *
@@ -236,6 +210,47 @@ public class ConfigurationManager {
         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.
      *
@@ -243,7 +258,13 @@ public class ConfigurationManager {
      * @return Whether the player has godmode through WorldGuard or CommandBook
      */
     public boolean hasGodMode(Player player) {
-        return plugin.getSessionManager().get(player).isInvincible(player);
+        if (hasCommandBookGodMode) {
+            GodComponent god = CommandBook.inst().getComponentManager().getComponent(GodComponent.class);
+            if (god != null) {
+                return god.hasGodMode(player);
+            }
+        }
+        return hasGodMode.contains(player.getName());
     }
 
     /**
@@ -252,10 +273,7 @@ public class ConfigurationManager {
      * @param player The player to enable amphibious mode for
      */
     public void enableAmphibiousMode(Player player) {
-        WaterBreathing handler = plugin.getSessionManager().get(player).getHandler(WaterBreathing.class);
-        if (handler != null) {
-            handler.setWaterBreathing(true);
-        }
+        hasAmphibious.add(player.getName());
     }
 
     /**
@@ -264,10 +282,7 @@ public class ConfigurationManager {
      * @param player The player to disable amphibious mode for
      */
     public void disableAmphibiousMode(Player player) {
-        WaterBreathing handler = plugin.getSessionManager().get(player).getHandler(WaterBreathing.class);
-        if (handler != null) {
-            handler.setWaterBreathing(false);
-        }
+        hasAmphibious.remove(player.getName());
     }
 
     /**
@@ -277,8 +292,7 @@ public class ConfigurationManager {
      * @return Whether {@code player} has amphibious mode
      */
     public boolean hasAmphibiousMode(Player player) {
-        WaterBreathing handler = plugin.getSessionManager().get(player).getHandler(WaterBreathing.class);
-        return handler != null && handler.hasWaterBreathing();
+        return hasAmphibious.contains(player.getName());
     }
 
     public void updateCommandBookGodMode() {

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

@@ -0,0 +1,154 @@
+// $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.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;
+
+/**
+ * Utility methods for porting from legacy versions.
+ * 
+ * @author sk89q
+ */
+public class LegacyWorldGuardMigration {
+    
+    /**
+     * Port over the blacklist.
+     * 
+     * @param plugin The plugin instance
+     */
+    public static void migrateBlacklist(WorldGuardPlugin plugin) {
+        World mainWorld = plugin.getServer().getWorlds().get(0);
+        String mainWorldName = mainWorld.getName();
+        String newPath = "worlds/" + mainWorldName + "/blacklist.txt";
+        
+        File oldFile = new File(plugin.getDataFolder(), "blacklist.txt");
+        File newFile = new File(plugin.getDataFolder(), newPath);
+        
+        if (!newFile.exists() && oldFile.exists()) {
+            plugin.getLogger().warning("WorldGuard will now update your blacklist "
+                    + "from an older version of WorldGuard.");
+            
+            // Need to make root directories
+            newFile.getParentFile().mkdirs();
+            
+            if (copyFile(oldFile, newFile)) {
+                oldFile.renameTo(new File(plugin.getDataFolder(),
+                        "blacklist.txt.old"));
+            } else {
+                plugin.getLogger().warning("blacklist.txt has been converted " +
+                        "for the main world at " + newPath + "");
+                plugin.getLogger().warning("Your other worlds currently have no " +
+                		"blacklist defined!");
+            }
+            
+        }
+    }
+
+    /**
+     * Migrate region settings.
+     * 
+     * @param plugin The plugin instance
+     */
+    public static void migrateRegions(WorldGuardPlugin plugin) {
+        try {
+            File oldDatabase = new File(plugin.getDataFolder(), "regions.txt");
+            if (!oldDatabase.exists()) return;
+            
+            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 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, plugin.getLogger());
+            db.load();
+            
+            // Then save the new database
+            mgr.setRegions(db.getRegions());
+            mgr.save();
+            
+            oldDatabase.renameTo(new File(plugin.getDataFolder(), "regions.txt.old"));
+
+            plugin.getLogger().info("Regions database converted!");
+        } catch (ProtectionDatabaseException e) {
+            plugin.getLogger().warning("Failed to load regions: "
+                    + e.getMessage());
+        }
+    }
+
+    /**
+     * Copies a file.
+     * 
+     * @param from The source file
+     * @param to The destination file
+     * @return true if successful
+     */
+    private static boolean copyFile(File from, File to) {
+        InputStream in = null;
+        OutputStream out = null;
+        
+        try {
+            in = new FileInputStream(from);
+            out = new FileOutputStream(to);
+
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = in.read(buf)) > 0) {
+                out.write(buf, 0, len);
+            }
+            
+            in.close();
+            out.close();
+            
+            return true;
+        } catch (FileNotFoundException ignore) {
+        } catch (IOException ignore) {
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException ignore) {
+                }
+            }
+            
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException ignore) {
+                }
+            }
+        }
+        
+        return false;
+    }
+}

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

@@ -1,32 +1,34 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * 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 Lesser General Public License
- * for more details.
+ * 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 Lesser General Public License
+ * 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.util.logging;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
+package com.sk89q.worldguard.bukkit;
 
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 /**
  * Sends all logger messages to a player.
+ *
+ * @author sk89q
  */
 public class LoggerToChatHandler extends Handler {
     /**

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

@@ -1,33 +1,29 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Foundation, either version 3 of the License, or
+ * 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.
+ * 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/>.
- */
+ * 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.permission;
+package com.sk89q.worldguard.bukkit;
 
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.annotation.Nullable;
+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.
@@ -37,10 +33,6 @@ public class RegionPermissionModel extends AbstractPermissionModel {
     public RegionPermissionModel(WorldGuardPlugin plugin, CommandSender sender) {
         super(plugin, sender);
     }
-
-    public boolean mayIgnoreRegionProtection(World world) {
-        return hasPluginPermission("region.bypass." + world.getName());
-    }
     
     public boolean mayForceLoadRegions() {
         return hasPluginPermission("region.load");
@@ -49,14 +41,10 @@ public class RegionPermissionModel extends AbstractPermissionModel {
     public boolean mayForceSaveRegions() {
         return hasPluginPermission("region.save");
     }
-
+    
     public boolean mayMigrateRegionStore() {
         return hasPluginPermission("region.migratedb");
     }
-
-    public boolean mayMigrateRegionNames() {
-        return hasPluginPermission("region.migrateuuid");
-    }
     
     public boolean mayDefine() {
         return hasPluginPermission("region.define");
@@ -99,10 +87,6 @@ public class RegionPermissionModel extends AbstractPermissionModel {
     public boolean mayTeleportTo(ProtectedRegion region) {
         return hasPatternPermission("teleport", region);
     }
-
-    public boolean mayOverrideLocationFlagBounds(ProtectedRegion region) {
-        return hasPatternPermission("locationoverride", region);
-    }
     
     public boolean mayList() {
         return hasPluginPermission("region.list");
@@ -123,45 +107,12 @@ public class RegionPermissionModel extends AbstractPermissionModel {
     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);
     }
-
-    public boolean maySetFlag(ProtectedRegion region, Flag<?> flag, @Nullable String value) {
-        String sanitizedValue;
-
-        if (value != null) {
-            sanitizedValue = value.trim().toLowerCase().replaceAll("[^a-z0-9]", "");
-            if (sanitizedValue.length() > 20) {
-                sanitizedValue = sanitizedValue.substring(0, 20);
-            }
-        } else {
-            sanitizedValue = "unset";
-        }
-
-        // This is a WTF permission
-        return hasPatternPermission(
-                "flag.flags." + flag.getName().toLowerCase() + "." + sanitizedValue, region);
-    }
-
-    public boolean mayAddMembers(ProtectedRegion region) {
-        return hasPatternPermission("addmember", region);
-    }
-
-    public boolean mayAddOwners(ProtectedRegion region) {
-        return hasPatternPermission("addowner", region);
-    }
-
-    public boolean mayRemoveMembers(ProtectedRegion region) {
-        return hasPatternPermission("removemember", region);
-    }
-
-    public boolean mayRemoveOwners(ProtectedRegion region) {
-        return hasPatternPermission("removeowner", region);
-    }
     
     /**
      * Checks to see if the given sender has permission to modify the given region

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

@@ -0,0 +1,337 @@
+// $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.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+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;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.util.LogListBlock;
+
+public class ReportWriter {
+
+    private static final SimpleDateFormat dateFmt =
+        new SimpleDateFormat("yyyy-MM-dd kk:mm Z");
+    
+    private Date date = new Date();
+    private StringBuilder output = new StringBuilder();
+    
+    public ReportWriter(WorldGuardPlugin plugin) {
+        appendReportHeader(plugin);
+        appendServerInformation(plugin.getServer());
+        appendPluginInformation(plugin.getServer().getPluginManager().getPlugins());
+        appendWorldInformation(plugin.getServer().getWorlds());
+        appendGlobalConfiguration(plugin.getGlobalStateManager());
+        appendWorldConfigurations(plugin, plugin.getServer().getWorlds(),
+                plugin.getGlobalRegionManager(), plugin.getGlobalStateManager());
+        appendln("-------------");
+        appendln("END OF REPORT");
+        appendln();
+    }
+    
+    protected static String repeat(String str, int n) {
+        if(str == null) {
+            return null;
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < n; i++) {
+            sb.append(str);
+        }
+        
+        return sb.toString();
+    }
+    
+    protected void appendln(String text) {
+        output.append(text);
+        output.append("\r\n");
+    }
+    
+    protected void appendln(String text, Object ... args) {
+        output.append(String.format(text, args));
+        output.append("\r\n");
+    }
+    
+    protected void append(LogListBlock log) {
+        output.append(log.toString());
+    }
+    
+    protected void appendln() {
+        output.append("\r\n");
+    }
+    
+    protected void appendHeader(String text) {
+        String rule = repeat("-", text.length());
+        output.append(rule);
+        output.append("\r\n");
+        appendln(text);
+        output.append(rule);
+        output.append("\r\n");
+        appendln();
+    }
+    
+    private void appendReportHeader(WorldGuardPlugin plugin) {
+        appendln("WorldGuard Configuration Report");
+        appendln("Generated " + dateFmt.format(date));
+        appendln();
+        appendln("Version: " + plugin.getDescription().getVersion());
+        appendln();
+    }
+    
+    private void appendGlobalConfiguration(ConfigurationManager config) {
+        appendHeader("Global Configuration");
+        
+        LogListBlock log = new LogListBlock();
+        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 ignore) {
+            }
+        }
+        
+        append(log);
+        appendln();
+    }
+    
+    private void appendServerInformation(Server server) {
+        appendHeader("Server Information");
+        
+        LogListBlock log = new LogListBlock();
+        
+        Runtime runtime = Runtime.getRuntime();
+
+        log.put("Java", "%s %s (%s)",
+                System.getProperty("java.vendor"),
+                System.getProperty("java.version"),
+                System.getProperty("java.vendor.url"));
+        log.put("Operating system", "%s %s (%s)",
+                System.getProperty("os.name"),
+                System.getProperty("os.version"),
+                System.getProperty("os.arch"));
+        log.put("Available processors", runtime.availableProcessors());
+        log.put("Free memory", runtime.freeMemory() / 1024 / 1024 + " MB");
+        log.put("Max memory", runtime.maxMemory() / 1024 / 1024 + " MB");
+        log.put("Total memory", runtime.totalMemory() / 1024 / 1024 + " MB");
+        log.put("Server ID", server.getServerId());
+        log.put("Server name", server.getServerName());
+        log.put("Implementation", server.getVersion());
+        //log.put("Address", server.getIp(), server.getPort());
+        log.put("Player count", "%d/%d",
+                server.getOnlinePlayers().length, server.getMaxPlayers());
+
+        append(log);
+        appendln();
+    }
+    
+    private void appendPluginInformation(Plugin[] plugins) {
+        appendHeader("Plugins (" + plugins.length + ")");
+        
+        LogListBlock log = new LogListBlock();
+        
+        for (Plugin plugin : plugins) {
+            log.put(plugin.getDescription().getName(), plugin.getDescription().getVersion());
+        }
+
+        append(log);
+        appendln();
+        
+        /*appendHeader("Plugin Information");
+        
+        log = new LogListBlock();
+        
+        for (Plugin plugin : plugins) {
+            log.putChild(plugin.getDescription().getName())
+                .put("Data folder", plugin.getDataFolder())
+                .put("Website", plugin.getDescription().getWebsite())
+                .put("Entry point", plugin.getDescription().getMain());
+        }
+
+        append(log);
+        appendln();*/
+    }
+    
+    private void appendWorldInformation(List<World> worlds) {
+        appendHeader("Worlds");
+        
+        LogListBlock log = new LogListBlock();
+        
+        int i = 0;
+        for (World world : worlds) {
+            int loadedChunkCount = world.getLoadedChunks().length;
+            
+            LogListBlock worldLog = log.putChild(world.getName() + " (" +  i + ")");
+            LogListBlock infoLog = worldLog.putChild("Information");
+            LogListBlock entitiesLog = worldLog.putChild("Entities");
+            
+            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());
+            infoLog.put("Loaded chunk count", loadedChunkCount);
+            infoLog.put("Spawn location", world.getSpawnLocation());
+            infoLog.put("Raw time", world.getFullTime());
+            
+            Map<Class<? extends Entity>, Integer> entityCounts =
+                    new HashMap<Class<? extends Entity>, Integer>();
+            
+            // Collect entities
+            for (Entity entity : world.getEntities()) {
+                Class<? extends Entity> cls = entity.getClass();
+                
+                if (entityCounts.containsKey(cls)) {
+                    entityCounts.put(cls, entityCounts.get(cls) + 1);
+                } else {
+                    entityCounts.put(cls, 1);
+                }
+            }
+            
+            // Print entities
+            for (Map.Entry<Class<? extends Entity>, Integer> entry
+                    : entityCounts.entrySet()) {
+                entitiesLog.put(entry.getKey().getSimpleName(),
+                        "%d [%f/chunk]",
+                        entry.getValue(),
+                        (float) (entry.getValue() / (double) loadedChunkCount));
+            }
+            
+            i++;
+        }
+
+        append(log);
+        appendln();
+    }
+    
+    private void appendWorldConfigurations(WorldGuardPlugin plugin, List<World> worlds,
+            GlobalRegionManager regionMgr, ConfigurationManager mgr) {
+        appendHeader("World Configurations");
+        
+        LogListBlock log = new LogListBlock();
+
+        int i = 0;
+        for (World world : worlds) {
+            LogListBlock worldLog = log.putChild(world.getName() + " (" +  i + ")");
+            LogListBlock infoLog = worldLog.putChild("Information");
+            LogListBlock configLog = worldLog.putChild("Configuration");
+            LogListBlock blacklistLog = worldLog.putChild("Blacklist");
+            LogListBlock regionsLog = worldLog.putChild("Region manager");
+
+            infoLog.put("Configuration file", (new File(plugin.getDataFolder(), "worlds/"
+                    + world.getName() + "/config.yml")).getAbsoluteFile());
+
+            infoLog.put("Blacklist file", (new File(plugin.getDataFolder(), "worlds/"
+                    + world.getName() + "/blacklist.txt")).getAbsoluteFile());
+            infoLog.put("Regions file", (new File(plugin.getDataFolder(), "worlds/"
+                    + world.getName() + "/regions.yml")).getAbsoluteFile());
+            
+            WorldConfiguration config = mgr.get(world);
+            
+            Class<? extends WorldConfiguration> cls = config.getClass();
+            for (Field field : cls.getFields()) {
+                try {
+                    Object val = field.get(config);
+                    configLog.put(field.getName(), String.valueOf(val));
+                } catch (IllegalArgumentException e) {
+                    e.printStackTrace();
+                } catch (IllegalAccessException ignore) {
+                }
+            }
+            
+            if (config.getBlacklist() == null) {
+                blacklistLog.put("State", "DISABLED");
+            } else {
+                blacklistLog.put("State", "Enabled");
+                blacklistLog.put("Number of items",
+                        config.getBlacklist().getItemCount());
+                blacklistLog.put("Is whitelist",
+                        config.getBlacklist().isWhitelist());
+            }
+
+            RegionManager worldRegions = regionMgr.get(world);
+
+            regionsLog.put("Type", worldRegions.getClass().getCanonicalName());
+            regionsLog.put("Number of regions", worldRegions.getRegions().size());
+            LogListBlock globalRegionLog = regionsLog.putChild("Global region");
+            
+            ProtectedRegion globalRegion = worldRegions.getRegion("__global__");
+            if (globalRegion == null) {
+                globalRegionLog.put("Status", "UNDEFINED");
+            } else {
+                for (Flag<?> flag : DefaultFlag.getFlags()) {
+                    if (flag instanceof StateFlag) {
+                        globalRegionLog.put(flag.getName(),
+                                globalRegion.getFlag(flag));
+                    }
+                }
+            }
+        }
+
+        append(log);
+        appendln();
+    }
+    
+    public void write(File file) throws IOException {
+        FileWriter writer = null;
+        BufferedWriter out;
+        
+        try {
+            writer = new FileWriter(file);
+            out = new BufferedWriter(writer);
+            out.write(output.toString());
+            out.close();
+        } finally {
+            if (writer != null) {
+                try {
+                    writer.close();
+                } catch (IOException ignore) {
+                }
+            }
+        }
+    }
+    
+    @Override
+    public String toString() {
+        return output.toString();
+    }
+}

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

@@ -1,132 +1,126 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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.listener;
-
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
-import com.sk89q.worldguard.bukkit.WorldConfiguration;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import org.bukkit.World;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.isBlockWater;
-import static com.sk89q.worldguard.bukkit.BukkitUtil.setBlockToWater;
-
-public final class SpongeUtil {
-
-    private 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);
-                }
-            }
-        }
-    }
-}
+// $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

@@ -1,21 +1,20 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Foundation, either version 3 of the License, or
+ * 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.
+ * 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/>.
- */
+ * 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;
 

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

@@ -1,51 +1,49 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * 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 Lesser General Public License
- * for more details.
+ * 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 Lesser General Public License
+ * 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.util.yaml.YAMLFormat;
-import com.sk89q.util.yaml.YAMLProcessor;
-import com.sk89q.worldguard.blacklist.Blacklist;
-import com.sk89q.worldguard.blacklist.BlacklistLoggerHandler;
-import com.sk89q.worldguard.blacklist.logger.ConsoleHandler;
-import com.sk89q.worldguard.blacklist.logger.DatabaseHandler;
-import com.sk89q.worldguard.blacklist.logger.FileHandler;
-import com.sk89q.worldguard.blacklist.target.TargetMatcherParseException;
-import com.sk89q.worldguard.blacklist.target.TargetMatcherParser;
-import com.sk89q.worldguard.bukkit.commands.CommandUtils;
-import com.sk89q.worldguard.bukkit.internal.BukkitBlacklist;
-import com.sk89q.worldguard.bukkit.internal.TargetMatcherSet;
-import com.sk89q.worldguard.chest.ChestProtection;
-import com.sk89q.worldguard.chest.SignChestProtection;
-import com.sk89q.worldguard.util.report.Unreported;
+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 org.yaml.snakeyaml.parser.ParserException;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+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.
@@ -55,9 +53,6 @@ import java.util.logging.Logger;
  */
 public class WorldConfiguration {
 
-    private static final Logger log = Logger.getLogger(WorldConfiguration.class.getCanonicalName());
-    private static final TargetMatcherParser matcherParser = new TargetMatcherParser();
-
     public static final String CONFIG_HEADER = "#\r\n" +
             "# WorldGuard's world configuration file\r\n" +
             "#\r\n" +
@@ -69,21 +64,19 @@ public class WorldConfiguration {
             "# Remove the {} and add your own entries.\r\n" +
             "#\r\n";
 
-    @Unreported private WorldGuardPlugin plugin;
+    private WorldGuardPlugin plugin;
 
-    @Unreported private String worldName;
-    @Unreported private YAMLProcessor parentConfig;
-    @Unreported private YAMLProcessor config;
+    private String worldName;
+    private YAMLProcessor parentConfig;
+    private YAMLProcessor config;
     private File blacklistFile;
 
-    @Unreported private Blacklist blacklist;
-    @Unreported private ChestProtection chestProtection = new SignChestProtection();
+    private Blacklist blacklist;
+    private ChestProtection chestProtection = new SignChestProtection();
 
     /* Configuration data start */
     public boolean summaryOnStart;
     public boolean opPermissions;
-    public boolean buildPermissions;
-    public String buildPermissionDenyMessage = "";
     public boolean fireSpreadDisableToggle;
     public boolean itemDurability;
     public boolean simulateSponge;
@@ -118,7 +111,6 @@ public class WorldConfiguration {
     public boolean blockOtherExplosions;
     public boolean blockEntityPaintingDestroy;
     public boolean blockEntityItemFrameDestroy;
-    public boolean blockEntityArmorStandDestroy;
     public boolean blockPluginSpawning;
     public boolean blockGroundSlimes;
     public boolean blockZombieDoorDestruction;
@@ -136,7 +128,6 @@ public class WorldConfiguration {
     public boolean disableMobDamage;
     public boolean useRegions;
     public boolean highFreqFlags;
-    public boolean checkLiquidFlow;
     public int regionWand;
     public Set<EntityType> blockCreatureSpawn;
     public boolean allowTamedSpawns;
@@ -146,7 +137,6 @@ public class WorldConfiguration {
     public int maxClaimVolume;
     public boolean claimOnlyInsideExistingRegions;
     public int maxRegionCountPerPlayer;
-    public boolean boundedLocationFlags;
     public boolean antiWolfDumbness;
     public boolean signChestProtection;
     public boolean disableSignChestProtectionCheck;
@@ -176,17 +166,13 @@ public class WorldConfiguration {
     public boolean disableSoilDehydration;
     public Set<Integer> allowedSnowFallOver;
     public boolean regionInvinciblityRemovesMobs;
-    public boolean regionNetherPortalProtection;
-    public boolean fakePlayerBuildOverride;
     public boolean explosionFlagCancellation;
     public boolean disableDeathMessages;
     public boolean disableObsidianGenerators;
-    public boolean strictEntitySpawn;
-    public TargetMatcherSet allowAllInteract;
 
-    public TargetMatcherSet blockUseAtFeet;
     private Map<String, Integer> maxRegionCounts;
 
+
     /* Configuration data end */
 
     /**
@@ -212,7 +198,7 @@ public class WorldConfiguration {
         loadConfiguration();
 
         if (summaryOnStart) {
-            log.info("Loaded configuration for world '" + worldName + "'");
+            plugin.getLogger().info("Loaded configuration for world '" + worldName + "'");
         }
     }
 
@@ -271,26 +257,6 @@ public class WorldConfiguration {
         return res;
     }
 
-    private TargetMatcherSet getTargetMatchers(String node) {
-        TargetMatcherSet set = new TargetMatcherSet();
-        List<String> inputs = parentConfig.getStringList(node, null);
-
-        if (inputs == null || inputs.size() == 0) {
-            parentConfig.setProperty(node, new ArrayList<String>());
-            return set;
-        }
-
-        for (String input : inputs) {
-            try {
-                set.add(matcherParser.fromInput(input));
-            } catch (TargetMatcherParseException e) {
-                log.warning("Failed to parse the block / item type specified as '" + input + "'");
-            }
-        }
-
-        return set;
-    }
-
     private List<String> getStringList(String node, List<String> def) {
         List<String> res = parentConfig.getStringList(node, def);
 
@@ -335,24 +301,13 @@ public class WorldConfiguration {
         try {
             config.load();
         } catch (IOException e) {
-            log.severe("Error reading configuration for world " + worldName + ": ");
+            plugin.getLogger().severe("Error reading configuration for world " + worldName + ": ");
             e.printStackTrace();
-        } catch (ParserException e) {
-            log.severe("Error parsing configuration for world " + worldName + ". ");
-            throw e;
         }
 
         summaryOnStart = getBoolean("summary-on-start", true);
         opPermissions = getBoolean("op-permissions", true);
 
-        buildPermissions = getBoolean("build-permission-nodes.enable", false);
-        buildPermissionDenyMessage = CommandUtils.replaceColorMacros(
-                getString("build-permission-nodes.deny-message", "&eSorry, but you are not permitted to do that here."));
-
-        strictEntitySpawn = getBoolean("event-handling.block-entity-spawns-with-untraceable-cause", false);
-        allowAllInteract = getTargetMatchers("event-handling.interaction-whitelist");
-        blockUseAtFeet = getTargetMatchers("event-handling.emit-block-use-at-feet");
-
         itemDurability = getBoolean("protection.item-durability", true);
         removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);
         disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false);
@@ -363,14 +318,14 @@ public class WorldConfiguration {
             PotionEffectType effect = PotionEffectType.getByName(potionName);
 
             if (effect == null) {
-                log.warning("Unknown potion effect type '" + potionName + "'");
+                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", false);
+        simulateSponge = getBoolean("simulation.sponge.enable", true);
         spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1;
         redstoneSponges = getBoolean("simulation.sponge.redstone", false);
 
@@ -408,7 +363,6 @@ public class WorldConfiguration {
         disableSnowmanTrails = getBoolean("mobs.disable-snowman-trails", false);
         blockEntityPaintingDestroy = getBoolean("mobs.block-painting-destroy", false);
         blockEntityItemFrameDestroy = getBoolean("mobs.block-item-frame-destroy", false);
-        blockEntityArmorStandDestroy = getBoolean("mobs.block-armor-stand-destroy", false);
         blockPluginSpawning = getBoolean("mobs.block-plugin-spawning", true);
         blockGroundSlimes = getBoolean("mobs.block-above-ground-slimes", false);
         blockOtherExplosions = getBoolean("mobs.block-other-explosions", false);
@@ -457,15 +411,11 @@ public class WorldConfiguration {
 
         useRegions = getBoolean("regions.enable", true);
         regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
-        regionNetherPortalProtection = getBoolean("regions.nether-portal-protection", false);
-        fakePlayerBuildOverride = getBoolean("regions.fake-player-build-override", true);
         explosionFlagCancellation = getBoolean("regions.explosion-flags-block-entity-damage", true);
         highFreqFlags = getBoolean("regions.high-frequency-flags", false);
-        checkLiquidFlow = getBoolean("regions.protect-against-liquid-flow", false);
         regionWand = getInt("regions.wand", 334);
         maxClaimVolume = getInt("regions.max-claim-volume", 30000);
         claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false);
-        boundedLocationFlags = getBoolean("regions.location-flags-only-inside-regions", false);
 
         maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player.default", 7);
         maxRegionCounts = new HashMap<String, Integer>();
@@ -489,9 +439,9 @@ public class WorldConfiguration {
             EntityType creature = EntityType.fromName(creatureName);
 
             if (creature == null) {
-                log.warning("Unknown mob type '" + creatureName + "'");
+                plugin.getLogger().warning("Unknown mob type '" + creatureName + "'");
             } else if (!creature.isAlive()) {
-                log.warning("Entity type '" + creatureName + "' is not a creature");
+                plugin.getLogger().warning("Entity type '" + creatureName + "' is not a creature");
             } else {
                 blockCreatureSpawn.add(creature);
             }
@@ -532,53 +482,53 @@ public class WorldConfiguration {
             } else {
                 this.blacklist = blist;
                 if (summaryOnStart) {
-                    log.log(Level.INFO, "Blacklist loaded.");
+                    plugin.getLogger().log(Level.INFO, "Blacklist loaded.");
                 }
 
-                BlacklistLoggerHandler blacklistLogger = blist.getLogger();
+                BlacklistLogger blacklistLogger = blist.getLogger();
 
                 if (logDatabase) {
-                    blacklistLogger.addHandler(new DatabaseHandler(dsn, user, pass, table, worldName, log));
+                    blacklistLogger.addHandler(new DatabaseLoggerHandler(dsn, user, pass, table, worldName, plugin.getLogger()));
                 }
 
                 if (logConsole) {
-                    blacklistLogger.addHandler(new ConsoleHandler(worldName, log));
+                    blacklistLogger.addHandler(new ConsoleLoggerHandler(worldName, plugin.getLogger()));
                 }
 
                 if (logFile) {
-                    FileHandler handler =
-                            new FileHandler(logFilePattern, logFileCacheSize, worldName, log);
+                    FileLoggerHandler handler =
+                            new FileLoggerHandler(logFilePattern, logFileCacheSize, worldName, plugin.getLogger());
                     blacklistLogger.addHandler(handler);
                 }
             }
         } catch (FileNotFoundException e) {
-            log.log(Level.WARNING, "WorldGuard blacklist does not exist.");
+            plugin.getLogger().log(Level.WARNING, "WorldGuard blacklist does not exist.");
         } catch (IOException e) {
-            log.log(Level.WARNING, "Could not load WorldGuard blacklist: "
+            plugin.getLogger().log(Level.WARNING, "Could not load WorldGuard blacklist: "
                     + e.getMessage());
         }
 
         // Print an overview of settings
         if (summaryOnStart) {
-            log.log(Level.INFO, blockTNTExplosions
+            plugin.getLogger().log(Level.INFO, blockTNTExplosions
                     ? "(" + worldName + ") TNT ignition is blocked."
                     : "(" + worldName + ") TNT ignition is PERMITTED.");
-            log.log(Level.INFO, blockLighter
+            plugin.getLogger().log(Level.INFO, blockLighter
                     ? "(" + worldName + ") Lighters are blocked."
                     : "(" + worldName + ") Lighters are PERMITTED.");
-            log.log(Level.INFO, preventLavaFire
+            plugin.getLogger().log(Level.INFO, preventLavaFire
                     ? "(" + worldName + ") Lava fire is blocked."
                     : "(" + worldName + ") Lava fire is PERMITTED.");
 
             if (disableFireSpread) {
-                log.log(Level.INFO, "(" + worldName + ") All fire spread is disabled.");
+                plugin.getLogger().log(Level.INFO, "(" + worldName + ") All fire spread is disabled.");
             } else {
                 if (disableFireSpreadBlocks.size() > 0) {
-                    log.log(Level.INFO, "(" + worldName
+                    plugin.getLogger().log(Level.INFO, "(" + worldName
                             + ") Fire spread is limited to "
                             + disableFireSpreadBlocks.size() + " block types.");
                 } else {
-                    log.log(Level.INFO, "(" + worldName
+                    plugin.getLogger().log(Level.INFO, "(" + worldName
                             + ") Fire spread is UNRESTRICTED.");
                 }
             }

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

@@ -1,27 +1,25 @@
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * 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 Lesser General Public License
- * for more details.
+ * 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 Lesser General Public License
+ * 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.listener;
+package com.sk89q.worldguard.bukkit;
 
 import com.sk89q.commandbook.InfoComponent;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import org.bukkit.entity.Player;
@@ -44,7 +42,8 @@ public class WorldGuardCommandBookListener implements Listener {
             Player player = (Player) event.getPlayer();
             LocalPlayer localPlayer = plugin.wrapPlayer(player);
             if (plugin.getGlobalStateManager().get(player.getWorld()).useRegions) {
-                ApplicableRegionSet regions = plugin.getRegionContainer().createQuery().getApplicableRegions(player.getLocation());
+                ApplicableRegionSet regions = plugin.getGlobalRegionManager()
+                        .get(player.getWorld()).getApplicableRegions(player.getLocation());
                 
                 // Current regions
                 StringBuilder regionStr = new StringBuilder();

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

@@ -0,0 +1,216 @@
+// $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.LivingEntity;
+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 org.bukkit.projectiles.ProjectileSource;
+
+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;
+                ProjectileSource remover = projectile.getShooter(); 
+                removerEntity = (remover instanceof LivingEntity ? (LivingEntity) remover : null);
+            }
+
+            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;
+                    }
+                }
+
+                // this now covers dispensers as well, if removerEntity is null above,
+                // due to a non-LivingEntity ProjectileSource
+                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/WorldGuardServerListener.java

@@ -1,25 +1,5 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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;
 
-package com.sk89q.worldguard.bukkit.listener;
-
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginDisableEvent;

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

@@ -0,0 +1,96 @@
+// $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.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+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

@@ -1,108 +1,110 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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.listener;
-
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
-import com.sk89q.worldguard.bukkit.WorldConfiguration;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-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;
-
-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) {
-            ApplicableRegionSet set = plugin.getRegionContainer().createQuery().getApplicableRegions(loc);
-
-            if (!set.allows(DefaultFlag.LIGHTNING)) {
-                event.setCancelled(true);
-            }
-        }
-    }
-}
+// $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

@@ -1,103 +1,83 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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.listener;
-
-import com.sk89q.worldguard.bukkit.BukkitUtil;
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
-import com.sk89q.worldguard.bukkit.WorldConfiguration;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-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;
-
-import java.util.logging.Logger;
-
-public class WorldGuardWorldListener implements Listener {
-
-    private static final Logger log = Logger.getLogger(WorldGuardWorldListener.class.getCanonicalName());
-    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) {
-                log.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);
-        }
-    }
-}
+// $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

@@ -1,313 +1,305 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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 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.worldguard.session.Session;
-import com.sk89q.worldguard.session.handler.GodMode;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-public class GeneralCommands {
-    private final WorldGuardPlugin plugin;
-
-    public GeneralCommands(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-    
-    @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<? extends Player> targets = null;
-        boolean included = false;
-        
-        // Detect arguments based on the number of arguments provided
-        if (args.argsLength() == 0) {
-            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god");
-        } else {
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god.other");
-        }
-
-        for (Player player : targets) {
-            Session session = plugin.getSessionManager().get(player);
-
-            if (GodMode.set(player, session, true)) {
-                player.setFireTicks(0);
-
-                // Tell the user
-                if (player.equals(sender)) {
-                    player.sendMessage(ChatColor.YELLOW + "God mode enabled! Use /ungod to disable.");
-
-                    // Keep track of this
-                    included = true;
-                } else {
-                    player.sendMessage(ChatColor.YELLOW + "God enabled by "
-                            + plugin.toName(sender) + ".");
-
-                }
-            }
-        }
-        
-        // 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 + "Players now have god mode.");
-        }
-    }
-    
-    @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<? extends Player> targets = null;
-        boolean included = false;
-        
-        // Detect arguments based on the number of arguments provided
-        if (args.argsLength() == 0) {
-            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god");
-        } else {
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god.other");
-        }
-
-        for (Player player : targets) {
-            Session session = plugin.getSessionManager().get(player);
-
-            if (GodMode.set(player, session, false)) {
-                // Tell the user
-                if (player.equals(sender)) {
-                    player.sendMessage(ChatColor.YELLOW + "God mode disabled!");
-
-                    // Keep track of this
-                    included = true;
-                } else {
-                    player.sendMessage(ChatColor.YELLOW + "God disabled by "
-                            + plugin.toName(sender) + ".");
-
-                }
-            }
-        }
-        
-        // 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 + "Players no longer have god mode.");
-        }
-    }
-    
-    @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1)
-    public void heal(CommandContext args,CommandSender sender) throws CommandException {
-
-        Iterable<? extends Player> targets = null;
-        boolean included = false;
-        
-        // Detect arguments based on the number of arguments provided
-        if (args.argsLength() == 0) {
-            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.heal");
-        } else if (args.argsLength() == 1) {            
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.heal.other");
-        }
-
-        for (Player player : targets) {
-            player.setHealth(player.getMaxHealth());
-            player.setFoodLevel(20);
-            player.setSaturation(20);
-            player.setExhaustion(0);
-            
-            // Tell the user
-            if (player.equals(sender)) {
-                player.sendMessage(ChatColor.YELLOW + "Healed!");
-                
-                // Keep track of this
-                included = true;
-            } else {
-                player.sendMessage(ChatColor.YELLOW + "Healed by "
-                        + plugin.toName(sender) + ".");
-                
-            }
-        }
-        
-        // 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 healed.");
-        }
-    }
-    
-    @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1)
-    public void slay(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Iterable<? extends Player> targets = null;
-        boolean included = false;
-        
-        // Detect arguments based on the number of arguments provided
-        if (args.argsLength() == 0) {
-            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.slay");
-        } else if (args.argsLength() == 1) {            
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.slay.other");
-        }
-
-        for (Player player : targets) {
-            player.setHealth(0);
-            
-            // Tell the user
-            if (player.equals(sender)) {
-                player.sendMessage(ChatColor.YELLOW + "Slain!");
-                
-                // Keep track of this
-                included = true;
-            } else {
-                player.sendMessage(ChatColor.YELLOW + "Slain by "
-                        + plugin.toName(sender) + ".");
-                
-            }
-        }
-        
-        // 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 slain.");
-        }
-    }
-    
-    @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1)
-    @CommandPermissions({"worldguard.locate"})
-    public void locate(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        
-        if (args.argsLength() == 0) {
-            player.setCompassTarget(player.getWorld().getSpawnLocation());
-            
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Compass reset to spawn.");
-        } else {
-            Player target = plugin.matchSinglePlayer(sender, args.getString(0));
-            player.setCompassTarget(target.getLocation());
-            
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Compass repointed.");
-        }
-    }
-    
-    @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0)
-    @CommandPermissions({"worldguard.stack"})
-    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;
-
-        int affected = 0;
-        
-        for (int i = 0; i < len; i++) {
-            ItemStack item = items[i];
-
-            // Avoid infinite stacks and stacks with durability
-            if (item == null || item.getAmount() <= 0
-                    || (!ignoreMax && item.getMaxStackSize() == 1)) {
-                continue;
-            }
-
-            int max = ignoreMax ? 64 : item.getMaxStackSize();
-
-            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++) {
-                    ItemStack item2 = items[j];
-
-                    // Avoid infinite stacks and stacks with durability
-                    if (item2 == null || item2.getAmount() <= 0
-                            || (!ignoreMax && item.getMaxStackSize() == 1)) {
-                        continue;
-                    }
-
-                    // Same type?
-                    // Blocks store their color in the damage value
-                    if (item2.getTypeId() == item.getTypeId() &&
-                            ((!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(max);
-                            item2.setAmount(item2.getAmount() - needed);
-                            break;
-                        // This stack will
-                        } else {
-                            items[j] = null;
-                            item.setAmount(item.getAmount() + item2.getAmount());
-                            needed = max - item.getAmount();
-                        }
-
-                        affected++;
-                    }
-                }
-            }
-        }
-
-        if (affected > 0) {
-            player.getInventory().setContents(items);
-        }
-
-        player.sendMessage(ChatColor.YELLOW + "Items compacted into stacks!");
-    }
-}
+// $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.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;
+
+public class GeneralCommands {
+    private final WorldGuardPlugin plugin;
+
+    public GeneralCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+    
+    @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;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god");
+        } else if (args.argsLength() == 1) {            
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god.other");
+        }
+
+        for (Player player : targets) {
+            config.enableGodMode(player);
+            player.setFireTicks(0);
+            
+            // Tell the user
+            if (player.equals(sender)) {
+                player.sendMessage(ChatColor.YELLOW + "God mode enabled! Use /ungod to disable.");
+                
+                // Keep track of this
+                included = true;
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "God enabled by "
+                        + plugin.toName(sender) + ".");
+                
+            }
+        }
+        
+        // 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.");
+        }
+    }
+    
+    @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;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god");
+        } else if (args.argsLength() == 1) {            
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god.other");
+        }
+
+        for (Player player : targets) {
+            config.disableGodMode(player);
+            
+            // Tell the user
+            if (player.equals(sender)) {
+                player.sendMessage(ChatColor.YELLOW + "God mode disabled!");
+                
+                // Keep track of this
+                included = true;
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "God disabled by "
+                        + plugin.toName(sender) + ".");
+                
+            }
+        }
+        
+        // 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 no longer have god mode.");
+        }
+    }
+    
+    @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;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.heal");
+        } else if (args.argsLength() == 1) {            
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.heal.other");
+        }
+
+        for (Player player : targets) {
+            player.setHealth(20);
+            player.setFoodLevel(20);
+            
+            // Tell the user
+            if (player.equals(sender)) {
+                player.sendMessage(ChatColor.YELLOW + "Healed!");
+                
+                // Keep track of this
+                included = true;
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "Healed by "
+                        + plugin.toName(sender) + ".");
+                
+            }
+        }
+        
+        // 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 healed.");
+        }
+    }
+    
+    @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;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.slay");
+        } else if (args.argsLength() == 1) {            
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.slay.other");
+        }
+
+        for (Player player : targets) {
+            player.setHealth(0);
+            
+            // Tell the user
+            if (player.equals(sender)) {
+                player.sendMessage(ChatColor.YELLOW + "Slain!");
+                
+                // Keep track of this
+                included = true;
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "Slain by "
+                        + plugin.toName(sender) + ".");
+                
+            }
+        }
+        
+        // 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 slain.");
+        }
+    }
+    
+    @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1)
+    @CommandPermissions({"worldguard.locate"})
+    public void locate(CommandContext args, CommandSender sender) throws CommandException {
+        
+        Player player = plugin.checkPlayer(sender);
+        
+        if (args.argsLength() == 0) {
+            player.setCompassTarget(player.getWorld().getSpawnLocation());
+            
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Compass reset to spawn.");
+        } else {
+            Player target = plugin.matchSinglePlayer(sender, args.getString(0));
+            player.setCompassTarget(target.getLocation());
+            
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Compass repointed.");
+        }
+    }
+    
+    @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0)
+    @CommandPermissions({"worldguard.stack"})
+    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;
+
+        int affected = 0;
+        
+        for (int i = 0; i < len; i++) {
+            ItemStack item = items[i];
+
+            // Avoid infinite stacks and stacks with durability
+            if (item == null || item.getAmount() <= 0
+                    || (!ignoreMax && item.getMaxStackSize() == 1)) {
+                continue;
+            }
+
+            int max = ignoreMax ? 64 : item.getMaxStackSize();
+
+            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++) {
+                    ItemStack item2 = items[j];
+
+                    // Avoid infinite stacks and stacks with durability
+                    if (item2 == null || item2.getAmount() <= 0
+                            || (!ignoreMax && item.getMaxStackSize() == 1)) {
+                        continue;
+                    }
+
+                    // Same type?
+                    // Blocks store their color in the damage value
+                    if (item2.getTypeId() == item.getTypeId() &&
+                            ((!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(max);
+                            item2.setAmount(item2.getAmount() - needed);
+                            break;
+                        // This stack will
+                        } else {
+                            items[j] = null;
+                            item.setAmount(item.getAmount() + item2.getAmount());
+                            needed = max - item.getAmount();
+                        }
+
+                        affected++;
+                    }
+                }
+            }
+        }
+
+        if (affected > 0) {
+            player.getInventory().setContents(items);
+        }
+
+        player.sendMessage(ChatColor.YELLOW + "Items compacted into stacks!");
+    }
+}

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

@@ -1,46 +1,44 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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 com.sk89q.worldguard.bukkit.commands.region.MemberCommands;
-import com.sk89q.worldguard.bukkit.commands.region.RegionCommands;
-import org.bukkit.command.CommandSender;
-
-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 {
-    @SuppressWarnings("unused")
-    private final WorldGuardPlugin plugin;
-
-    public ProtectionCommands(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Command(aliases = {"region", "regions", "rg"}, desc = "Region management commands")
-    @NestedCommand({RegionCommands.class, MemberCommands.class})
-    public void region(CommandContext args, CommandSender sender) {}
-
-    @Command(aliases = {"worldguard", "wg"}, desc = "WorldGuard commands")
-    @NestedCommand({WorldGuardCommands.class})
-    public void worldGuard(CommandContext args, CommandSender sender) {}
-}
+// $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.command.CommandSender;
+
+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 {
+    @SuppressWarnings("unused")
+    private final WorldGuardPlugin plugin;
+
+    public ProtectionCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @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 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.getParsedPaddedSlice(1, 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.getParsedPaddedSlice(1, 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().removeAll();
+        } else {
+            if (args.argsLength() < 2) {
+                throw new CommandException("List some names to remove, or use -a to remove all.");
+            }
+            RegionDBUtil.removeFromDomain(region.getMembers(), args.getParsedPaddedSlice(1, 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().removeAll();
+        } else {
+            if (args.argsLength() < 2) {
+                throw new CommandException("List some names to remove, or use -a to remove all.");
+            }
+            RegionDBUtil.removeFromDomain(region.getOwners(), args.getParsedPaddedSlice(1, 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

@@ -1,62 +1,53 @@
+// $Id$
 /*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
+ * 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 Foundation, either version 3 of the License, or
+ * 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.
+ * 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/>.
- */
+ * 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.region;
+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.squirrelid.cache.ProfileCache;
 import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 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.flags.registry.FlagRegistry;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.concurrent.Callable;
 
 /**
  * Create a region printout, as used in /region info to show information about
  * a region.
  */
-public class RegionPrintoutBuilder implements Callable<String> {
+public class RegionPrintoutBuilder {
     
     private final ProtectedRegion region;
-    @Nullable
-    private final ProfileCache cache;
     private final StringBuilder builder = new StringBuilder();
 
     /**
      * Create a new instance with a region to report on.
-     *
+     * 
      * @param region the region
-     * @param cache a profile cache, or {@code null}
      */
-    public RegionPrintoutBuilder(ProtectedRegion region, @Nullable ProfileCache cache) {
+    public RegionPrintoutBuilder(ProtectedRegion region) {
         this.region = region;
-        this.cache = cache;
     }
 
     /**
@@ -77,7 +68,7 @@ public class RegionPrintoutBuilder implements Callable<String> {
         
         builder.append(ChatColor.GRAY);
         builder.append(" (type=");
-        builder.append(region.getType().getName());
+        builder.append(region.getTypeName());
         
         builder.append(ChatColor.GRAY);
         builder.append(", priority=");
@@ -107,7 +98,7 @@ public class RegionPrintoutBuilder implements Callable<String> {
     public void appendFlagsList(boolean useColors) {
         boolean hasFlags = false;
         
-        for (Flag<?> flag : WorldGuardPlugin.inst().getFlagRegistry()) {
+        for (Flag<?> flag : DefaultFlag.getFlags()) {
             Object val = region.getFlag(flag), group = null;
             
             // No value
@@ -128,13 +119,13 @@ public class RegionPrintoutBuilder implements Callable<String> {
                 group = region.getFlag(groupFlag);
             }
 
-            if (group == null) {
+            if(group == null) {
                 builder.append(flag.getName()).append(": ")
-                        .append(ChatColor.stripColor(String.valueOf(val)));
+                    .append(String.valueOf(val));
             } else {
                 builder.append(flag.getName()).append(" -g ")
-                        .append(group).append(": ")
-                        .append(ChatColor.stripColor(String.valueOf(val)));
+                    .append(String.valueOf(group)).append(": ")
+                    .append(String.valueOf(val));
             }
 
             hasFlags = true;
@@ -200,7 +191,7 @@ public class RegionPrintoutBuilder implements Callable<String> {
                 if (useColors) {
                     builder.append(ChatColor.GRAY);
                 }
-                builder.append(" (parent, priority=").append(cur.getPriority()).append(")");
+                builder.append(" (parent, priority=" + cur.getPriority() + ")");
             }
             
             indent++;
@@ -214,23 +205,29 @@ public class RegionPrintoutBuilder implements Callable<String> {
     public void appendDomain() {
         builder.append(ChatColor.BLUE);
         builder.append("Owners: ");
-        addDomainString(region.getOwners());
+        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: ");
-        addDomainString(region.getMembers());
-        newLine();
-    }
-
-    private void addDomainString(DefaultDomain domain) {
-        if (domain.size() != 0) {
+        DefaultDomain members = region.getMembers();
+        if (members.size() != 0) {
             builder.append(ChatColor.YELLOW);
-            builder.append(domain.toUserFriendlyString(cache));
+            builder.append(members.toUserFriendlyString());
         } else {
             builder.append(ChatColor.RED);
-            builder.append("(none)");
+            builder.append("(no members)");
         }
+        
+        newLine();
     }
     
     /**
@@ -242,13 +239,16 @@ public class RegionPrintoutBuilder implements Callable<String> {
         builder.append(ChatColor.BLUE);
         builder.append("Bounds:");
         builder.append(ChatColor.YELLOW);
-        builder.append(" (").append(min.getBlockX()).append(",").append(min.getBlockY()).append(",").append(min.getBlockZ()).append(")");
-        builder.append(" -> (").append(max.getBlockX()).append(",").append(max.getBlockY()).append(",").append(max.getBlockZ()).append(")");
+        builder.append(" (" + min.getBlockX() + "," + min.getBlockY() + "," + min.getBlockZ() + ")");
+        builder.append(" -> (" + max.getBlockX() + "," + max.getBlockY() + "," + max.getBlockZ() + ")");
         
         newLine();
     }
-
-    private void appendRegionInformation() {
+    
+    /**
+     * 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 ");
@@ -259,28 +259,17 @@ public class RegionPrintoutBuilder implements Callable<String> {
         appendParents();
         appendDomain();
         appendBounds();
-
-        if (cache != null) {
-            builder.append(ChatColor.GRAY).append("Any names suffixed by * are 'last seen names' and may not be up to date.");
-            newLine();
-        }
     }
-
-    @Override
-    public String call() throws Exception {
-        appendRegionInformation();
-        return builder.toString();
-    }
-
+    
     /**
      * Send the report to a {@link CommandSender}.
-     *
-     * @param sender the recipient
+     * 
+     * @param sender the recepient
      */
     public void send(CommandSender sender) {
         sender.sendMessage(toString());
     }
-
+    
     public StringBuilder append(boolean b) {
         return builder.append(b);
     }

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

@@ -1,165 +1,145 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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 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 = "cis", max = 0)
-    @CommandPermissions({"worldguard.halt-activity"})
-    public void stopLag(CommandContext args, CommandSender sender) throws CommandException {
-
-        ConfigurationManager configManager = plugin.getGlobalStateManager();
-
-        if (args.hasFlag('i')) {
-            if (configManager.activityHaltToggle) {
-                 sender.sendMessage(ChatColor.YELLOW
-                         + "ALL intensive server activity is not allowed.");
-            } else {
-                 sender.sendMessage(ChatColor.YELLOW
-                         + "ALL intensive server activity is allowed.");
-            }
-        } else {
-            configManager.activityHaltToggle = !args.hasFlag('c');
-
-            if (configManager.activityHaltToggle) {
-                if (!(sender instanceof Player)) {
-                    sender.sendMessage(ChatColor.YELLOW
-                            + "ALL intensive server activity halted.");
-                }
-
-                if (!args.hasFlag('s')) {
-                    plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                             + "ALL intensive server activity halted by "
-                             + plugin.toName(sender) + ".");
-                } else {
-                    sender.sendMessage(ChatColor.YELLOW
-                        + "(Silent) 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 (!args.hasFlag('s')) {
-                    plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                            + "ALL intensive server activity is now allowed.");
-                    
-                    if (!(sender instanceof Player)) {
-                        sender.sendMessage(ChatColor.YELLOW
-                                + "ALL intensive server activity is now allowed.");
-                    }
-                } else {
-                    sender.sendMessage(ChatColor.YELLOW
-                            + "(Silent) ALL intensive server activity is now allowed.");
-                }
-            }
-        }
-    }
-}
+// $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

@@ -0,0 +1,138 @@
+// $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.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;
+import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldguard.bukkit.LoggerToChatHandler;
+import com.sk89q.worldguard.bukkit.ReportWriter;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.util.PastebinPoster;
+import com.sk89q.worldguard.util.PastebinPoster.PasteCallback;
+
+public class WorldGuardCommands {
+    private final WorldGuardPlugin plugin;
+
+    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"}, desc = "Reload WorldGuard configuration", max = 0)
+    @CommandPermissions({"worldguard.reload"})
+    public void reload(CommandContext args, CommandSender sender) throws CommandException {
+        
+        LoggerToChatHandler handler = null;
+        Logger minecraftLogger = null;
+        
+        if (sender instanceof Player) {
+            handler = new LoggerToChatHandler(sender);
+            handler.setLevel(Level.ALL);
+            minecraftLogger = Logger.getLogger("Minecraft");
+            minecraftLogger.addHandler(handler);
+        }
+
+        try {
+            plugin.getGlobalStateManager().unload();
+            plugin.getGlobalRegionManager().unload();
+            plugin.getGlobalStateManager().load();
+            plugin.getGlobalRegionManager().preload();
+            // WGBukkit.cleanCache();
+            sender.sendMessage("WorldGuard configuration reloaded.");
+        } catch (Throwable t) {
+            sender.sendMessage("Error while reloading: "
+                    + t.getMessage());
+        } finally {
+            if (minecraftLogger != null) {
+                minecraftLogger.removeHandler(handler);
+            }
+        }
+    }
+    
+    @Command(aliases = {"report"}, desc = "Writes a report on WorldGuard", flags = "p", max = 0)
+    @CommandPermissions({"worldguard.report"})
+    public void report(CommandContext args, final CommandSender sender) throws CommandException {
+        
+        File dest = new File(plugin.getDataFolder(), "report.txt");
+        ReportWriter report = new ReportWriter(plugin);
+        
+        try {
+            report.write(dest);
+            sender.sendMessage(ChatColor.YELLOW + "WorldGuard report written to "
+                    + dest.getAbsolutePath());
+        } catch (IOException e) {
+            throw new CommandException("Failed to write report: " + e.getMessage());
+        }
+        
+        if (args.hasFlag('p')) {
+            plugin.checkPermission(sender, "worldguard.report.pastebin");
+            
+            sender.sendMessage(ChatColor.YELLOW + "Now uploading to Pastebin...");
+            PastebinPoster.paste(report.toString(), new PasteCallback() {
+                
+                public void handleSuccess(String url) {
+                    // Hope we don't have a thread safety issue here
+                    sender.sendMessage(ChatColor.YELLOW + "WorldGuard report (1 hour): " + url);
+                }
+                
+                public void handleError(String err) {
+                    // Hope we don't have a thread safety issue here
+                    sender.sendMessage(ChatColor.YELLOW + "WorldGuard report pastebin error: " + err);
+                }
+            });
+        }
+
+    }
+
+    @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

@@ -1,77 +1,77 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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.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);
-
+// $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

@@ -1,159 +1,159 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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.chest;
-
-import com.sk89q.worldedit.blocks.BlockID;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.Sign;
-import org.bukkit.entity.Player;
-
-/**
- * Sign-based chest protection.
- * 
- * @author sk89q
- */
-public class SignChestProtection implements ChestProtection {
-    
-    public boolean isProtected(Block block, Player player) {
-        if (isChest(block.getTypeId())) {
-            Block below = block.getRelative(0, -1, 0);
-            return isProtectedSignAround(below, player);
-        } else if (block.getTypeId() == BlockID.SIGN_POST) {
-            return isProtectedSignAndChestBinary(block, player);
-        } else {
-            Block above = block.getRelative(0, 1, 0);
-            Boolean res = isProtectedSign(above, player);
-            if (res != null) return res;
-            return false;
-        }
-    }
-    
-    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 && res) return res;
-        
-        side = searchBlock.getRelative(-1, 0, 0);
-        res = isProtectedSignAndChest(side, player);
-        if (res != null && res) return res;
-        
-        side = searchBlock.getRelative(1, 0, 0);
-        res = isProtectedSignAndChest(side, player);
-        if (res != null && res) return res;
-        
-        side = searchBlock.getRelative(0, 0, -1);
-        res = isProtectedSignAndChest(side, player);
-        if (res != null && res) return res;
-        
-        side = searchBlock.getRelative(0, 0, 1);
-        res = isProtectedSignAndChest(side, player);
-        if (res != null && res) return res;
-        
-        return false;
-    }
-    
-    private Boolean isProtectedSign(Sign sign, Player player) {
-        if (sign.getLine(0).equalsIgnoreCase("[Lock]")) {
-            if (player == null) { // No player, no access
-                return true;
-            }
-            
-            String name = player.getName();
-            if (name.equalsIgnoreCase(sign.getLine(1).trim())
-                    || name.equalsIgnoreCase(sign.getLine(2).trim())
-                    || name.equalsIgnoreCase(sign.getLine(3).trim())) {
-                return false;
-            }
-            
-            // No access!
-            return true;
-        }
-        
-        return null;
-    }
-    
-    private Boolean isProtectedSign(Block block, Player player) {
-        BlockState state = block.getState();
-        if (state == null || !(state instanceof Sign)) {
-            return null;
-        }
-        return isProtectedSign((Sign) state, player);
-    }
-    
-    private Boolean isProtectedSignAndChest(Block block, Player player) {
-        if (!isChest(block.getRelative(0, 1, 0).getTypeId())) {
-            return null;
-        }
-        return isProtectedSign(block, player);
-    }
-    
-    private boolean isProtectedSignAndChestBinary(Block block, Player player) {
-        Boolean res = isProtectedSignAndChest(block, player);
-        return !(res == null || !res);
-    }
-
-    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;
-    }
-}
+// $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 com.sk89q.worldedit.blocks.BlockID;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Sign;
+import org.bukkit.entity.Player;
+
+/**
+ * Sign-based chest protection.
+ * 
+ * @author sk89q
+ */
+public class SignChestProtection implements ChestProtection {
+    
+    public boolean isProtected(Block block, Player player) {
+        if (isChest(block.getTypeId())) {
+            Block below = block.getRelative(0, -1, 0);
+            return isProtectedSignAround(below, player);
+        } else if (block.getTypeId() == BlockID.SIGN_POST) {
+            return isProtectedSignAndChestBinary(block, player);
+        } else {
+            Block above = block.getRelative(0, 1, 0);
+            Boolean res = isProtectedSign(above, player);
+            if (res != null) return res;
+            return false;
+        }
+    }
+    
+    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 && res) return res;
+        
+        side = searchBlock.getRelative(-1, 0, 0);
+        res = isProtectedSignAndChest(side, player);
+        if (res != null && res) return res;
+        
+        side = searchBlock.getRelative(1, 0, 0);
+        res = isProtectedSignAndChest(side, player);
+        if (res != null && res) return res;
+        
+        side = searchBlock.getRelative(0, 0, -1);
+        res = isProtectedSignAndChest(side, player);
+        if (res != null && res) return res;
+        
+        side = searchBlock.getRelative(0, 0, 1);
+        res = isProtectedSignAndChest(side, player);
+        if (res != null && res) return res;
+        
+        return false;
+    }
+    
+    private Boolean isProtectedSign(Sign sign, Player player) {
+        if (sign.getLine(0).equalsIgnoreCase("[Lock]")) {
+            if (player == null) { // No player, no access
+                return true;
+            }
+            
+            String name = player.getName();
+            if (name.equalsIgnoreCase(sign.getLine(1).trim())
+                    || name.equalsIgnoreCase(sign.getLine(2).trim())
+                    || name.equalsIgnoreCase(sign.getLine(3).trim())) {
+                return false;
+            }
+            
+            // No access!
+            return true;
+        }
+        
+        return null;
+    }
+    
+    private Boolean isProtectedSign(Block block, Player player) {
+        BlockState state = block.getState();
+        if (state == null || !(state instanceof Sign)) {
+            return null;
+        }
+        return isProtectedSign((Sign) state, player);
+    }
+    
+    private Boolean isProtectedSignAndChest(Block block, Player player) {
+        if (!isChest(block.getRelative(0, 1, 0).getTypeId())) {
+            return null;
+        }
+        return isProtectedSign(block, player);
+    }
+    
+    private boolean isProtectedSignAndChestBinary(Block block, Player player) {
+        Boolean res = isProtectedSignAndChest(block, player);
+        return !(res == null || !res);
+    }
+
+    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;
+    }
+}

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

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

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

@@ -0,0 +1,22 @@
+package com.sk89q.worldguard.domains;
+
+import com.sk89q.worldguard.LocalPlayer;
+
+public interface Domain {
+    /**
+     * Returns true if a domain contains a player.
+     *
+     * @param player The player to check
+     * @return whether this domain contains {@code player}
+     */
+    boolean contains(LocalPlayer player);
+
+    /**
+     * Returns true if a domain contains a player.<br />
+     * This method doesn't check for groups!
+     *
+     * @param playerName The name of the player to check
+     * @return whether this domain contains a player by that name
+     */
+    boolean contains(String playerName);
+}

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

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

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

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

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

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

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

@@ -0,0 +1,402 @@
+// $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.LocalPlayer;
+import com.sk89q.worldguard.protection.flags.*;
+import com.sk89q.worldguard.protection.flags.StateFlag.State;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+import java.util.*;
+
+/**
+ * Represents a set of regions for a particular point or area and the rules
+ * that are represented by that set. An instance of this can be used to
+ * query the value of a flag or check if a player can build in the respective
+ * region or point. This object contains the list of applicable regions and so
+ * the expensive search of regions that are in the desired area has already
+ * been completed.
+ * 
+ * @author sk89q
+ */
+public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
+
+    private Collection<ProtectedRegion> applicable;
+    private ProtectedRegion globalRegion;
+
+    /**
+     * Construct the object.
+     * 
+     * @param applicable The regions contained in this set
+     * @param globalRegion The global region, set aside for special handling.
+     */
+    public ApplicableRegionSet(Collection<ProtectedRegion> applicable,
+            ProtectedRegion globalRegion) {
+        this.applicable = applicable;
+        this.globalRegion = globalRegion;
+    }
+    
+    /**
+     * Checks if a player can build in an area.
+     * 
+     * @param player The player to check
+     * @return build ability
+     */
+    public boolean canBuild(LocalPlayer player) {
+        return internalGetState(DefaultFlag.BUILD, player, null);
+    }
+
+    public boolean canConstruct(LocalPlayer player) {
+        final RegionGroup flag = getFlag(DefaultFlag.CONSTRUCT, player);
+        return RegionGroupFlag.isMember(this, flag, player);
+    }
+
+    /**
+     * Checks if a player can use buttons and such in an area.
+     * 
+     * @param player The player to check
+     * @return able to use items
+     * @deprecated This method seems to be the opposite of its name
+     */
+    @Deprecated
+    public boolean canUse(LocalPlayer player) {
+        return !allows(DefaultFlag.USE, player)
+                && !canBuild(player);
+    }
+
+    /**
+     * Gets the state of a state flag. This cannot be used for the build flag.
+     *
+     * @param flag flag to check
+     * @return whether it is allowed
+     * @throws IllegalArgumentException if the build flag is given
+     */
+    public boolean allows(StateFlag flag) {
+        if (flag == DefaultFlag.BUILD) {
+            throw new IllegalArgumentException("Can't use build flag with allows()");
+        }
+        return internalGetState(flag, null, null);
+    }
+    
+    /**
+     * Gets the state of a state flag. This cannot be used for the build flag.
+     * 
+     * @param flag flag to check
+     * @param player player (used by some flags)
+     * @return whether the state is allows for it
+     * @throws IllegalArgumentException if the build flag is given
+     */
+    public boolean allows(StateFlag flag, LocalPlayer player) {
+        if (flag == DefaultFlag.BUILD) {
+            throw new IllegalArgumentException("Can't use build flag with allows()");
+        }
+        return internalGetState(flag, null, player);
+    }
+    
+    /**
+     * Indicates whether a player is an owner of all regions in this set.
+     * 
+     * @param player player
+     * @return whether the player is an owner of all regions
+     */
+    public boolean isOwnerOfAll(LocalPlayer player) {
+        for (ProtectedRegion region : applicable) {
+            if (!region.isOwner(player)) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
+    /**
+     * Indicates whether a player is an owner or member of all regions in
+     * this set.
+     * 
+     * @param player player
+     * @return whether the player is a member of all regions
+     */
+    public boolean isMemberOfAll(LocalPlayer player) {
+        for (ProtectedRegion region : applicable) {
+            if (!region.isMember(player)) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+
+    /**
+     * Checks to see if a flag is permitted.
+     * 
+     * @param flag flag to check
+     * @param player null to not check owners and members
+     * @param groupPlayer player to use for the group flag check
+     * @return the allow/deny state for the flag
+     */
+    private boolean internalGetState(StateFlag flag, LocalPlayer player,
+                                     LocalPlayer groupPlayer) {
+        boolean found = false;
+        boolean hasFlagDefined = false;
+        boolean allowed = false; // Used for ALLOW override
+        boolean def = flag.getDefault();
+        
+        // Handle defaults
+        if (globalRegion != null) {
+            State globalState = globalRegion.getFlag(flag);
+
+            // The global region has this flag set
+            if (globalState != null) {
+                // Build flag is very special
+                if (player != null && globalRegion.hasMembersOrOwners()) {
+                    def = globalRegion.isMember(player) && (globalState == State.ALLOW);
+                } else {
+                    def = (globalState == State.ALLOW);
+                }
+            } else {
+                // Build flag is very special
+                if (player != null && globalRegion.hasMembersOrOwners()) {
+                    def = globalRegion.isMember(player);
+                }
+            }
+        }
+        
+        // The player argument is used if and only if the flag is the build
+        // flag -- in which case, if there are any regions in this area, we
+        // default to FALSE, otherwise true if there are no defined regions.
+        // However, other flags are different -- if there are regions defined,
+        // we default to the global region value. 
+        if (player == null) {
+            allowed = def; 
+        }
+        
+        int lastPriority = Integer.MIN_VALUE;
+
+        // The algorithm is as follows:
+        // While iterating through the list of regions, if an entry disallows
+        // the flag, then put it into the needsClear set. If an entry allows
+        // the flag and it has a parent, then its parent is put into hasCleared.
+        // In the situation that the child is reached before the parent, upon
+        // the parent being reached, even if the parent disallows, because the
+        // parent will be in hasCleared, permission will be allowed. In the
+        // other case, where the parent is reached first, if it does not allow
+        // permissions, it will be placed into needsClear. If a child of
+        // the parent is reached later, the parent will be removed from
+        // needsClear. At the end, if needsClear is not empty, that means that
+        // permission should not be given. If a parent has multiple children
+        // and one child does not allow permissions, then it will be placed into
+        // needsClear just like as if was a parent.
+
+        Set<ProtectedRegion> needsClear = new HashSet<ProtectedRegion>();
+        Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
+
+        for (ProtectedRegion region : applicable) {
+            // Ignore lower priority regions
+            if (hasFlagDefined && region.getPriority() < lastPriority) {
+                break;
+            }
+
+            lastPriority = region.getPriority();
+
+            // Ignore non-build regions
+            if (player != null
+                    && region.getFlag(DefaultFlag.PASSTHROUGH) == State.ALLOW) {
+                continue;
+            }
+
+            // Check group permissions
+            if (groupPlayer != null && flag.getRegionGroupFlag() != null) {
+                RegionGroup group = region.getFlag(flag.getRegionGroupFlag());
+                if (group == null) {
+                    group = flag.getRegionGroupFlag().getDefault();
+                }
+                if (!RegionGroupFlag.isMember(region, group, groupPlayer)) {
+                    continue;
+                }
+            }
+
+            State v = region.getFlag(flag);
+
+            // Allow DENY to override everything
+            if (v == State.DENY) {
+                return false;
+            }
+
+            // Forget about regions that allow it, although make sure the
+            // default state is now to allow
+            if (v == State.ALLOW) {
+                allowed = true;
+                found = true;
+                hasFlagDefined = true;
+                continue;
+            }
+
+            // For the build flag, the flags are conditional and are based
+            // on membership, so we have to check for parent-child
+            // relationships
+            if (player != null) {
+                hasFlagDefined = true;
+
+                if (hasCleared.contains(region)) {
+                    // Already cleared, so do nothing
+                } else {
+                    if (!region.isMember(player)) {
+                        needsClear.add(region);
+                    } else {
+                        // Need to clear all parents
+                        clearParents(needsClear, hasCleared, region);
+                    }
+                }
+            }
+
+            found = true;
+        }
+
+        return !found ? def :
+                (allowed || (player != null && needsClear.size() == 0));
+    }
+
+    /**
+     * Clear a region's parents for isFlagAllowed().
+     * 
+     * @param needsClear The regions that should be cleared
+     * @param hasCleared The regions already cleared
+     * @param region The region to start from
+     */
+    private void clearParents(Set<ProtectedRegion> needsClear,
+            Set<ProtectedRegion> hasCleared, ProtectedRegion region) {
+        ProtectedRegion parent = region.getParent();
+
+        while (parent != null) {
+            if (!needsClear.remove(parent)) {
+                hasCleared.add(parent);
+            }
+
+            parent = parent.getParent();
+        }
+    }
+
+    /**
+     * @see #getFlag(com.sk89q.worldguard.protection.flags.Flag, com.sk89q.worldguard.LocalPlayer)
+     * @param flag flag to check
+     * @return value of the flag
+     */
+    public <T extends Flag<V>, V> V getFlag(T flag) {
+        return getFlag(flag, null);
+    }
+
+    /**
+     * Gets the value of a flag. Do not use this for state flags
+     * (use {@link #allows(StateFlag, LocalPlayer)} for that).
+     * 
+     * @param flag flag to check
+     * @param groupPlayer player to check {@link RegionGroup}s against
+     * @return value of the flag
+     * @throws IllegalArgumentException if a StateFlag is given
+     */
+    public <T extends Flag<V>, V> V getFlag(T flag, LocalPlayer groupPlayer) {
+        /*
+        if (flag instanceof StateFlag) {
+            throw new IllegalArgumentException("Cannot use StateFlag with getFlag()");
+        }
+        */
+
+        int lastPriority = 0;
+        boolean found = false;
+
+        Map<ProtectedRegion, V> needsClear = new HashMap<ProtectedRegion, V>();
+        Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
+
+        for (ProtectedRegion region : applicable) {
+            // Ignore lower priority regions
+            if (found && region.getPriority() < lastPriority) {
+                break;
+            }
+
+            // Check group permissions
+            if (groupPlayer != null && flag.getRegionGroupFlag() != null) {
+                RegionGroup group = region.getFlag(flag.getRegionGroupFlag());
+                if (group == null) {
+                    group = flag.getRegionGroupFlag().getDefault();
+                }
+                if (!RegionGroupFlag.isMember(region, group, groupPlayer)) {
+                    continue;
+                }
+            }
+
+            if (hasCleared.contains(region)) {
+                // Already cleared, so do nothing
+            } else if (region.getFlag(flag) != null) {
+                clearParents(needsClear, hasCleared, region);
+
+                needsClear.put(region, region.getFlag(flag));
+
+                found = true;
+            }
+
+            lastPriority = region.getPriority();
+        }
+        
+        if (!needsClear.isEmpty()) {
+            return needsClear.values().iterator().next();
+        } else {
+            if (globalRegion != null) {
+                V gFlag = globalRegion.getFlag(flag);
+                if (gFlag != null) return gFlag;
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Clear a region's parents for getFlag().
+     * 
+     * @param needsClear The regions that should be cleared
+     * @param hasCleared The regions already cleared
+     * @param region The region to start from
+     */
+    private void clearParents(Map<ProtectedRegion, ?> needsClear,
+            Set<ProtectedRegion> hasCleared, ProtectedRegion region) {
+        ProtectedRegion parent = region.getParent();
+
+        while (parent != null) {
+            if (needsClear.remove(parent) == null) {
+                hasCleared.add(parent);
+            }
+
+            parent = parent.getParent();
+        }
+    }
+    
+    /**
+     * Get the number of regions that are included.
+     * 
+     * @return the size of this ApplicbleRegionSet
+     */
+    public int size() {
+        return applicable.size();
+    }
+    
+    /**
+     * Get an iterator of affected regions.
+     */
+    public Iterator<ProtectedRegion> iterator() {
+        return applicable.iterator();
+    }
+}

src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java

@@ -0,0 +1,372 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.bukkit.BukkitUtil;
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
+import com.sk89q.worldguard.bukkit.WorldConfiguration;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.databases.MySQLDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.YAMLDatabase;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+/**
+ * This class keeps track of region information for every world. It loads
+ * world region information as needed.
+ *
+ * @author sk89q
+ * @author Redecouverte
+ */
+public class GlobalRegionManager {
+
+    /**
+     * Reference to the plugin.
+     */
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Reference to the global configuration.
+     */
+    private ConfigurationManager config;
+
+    /**
+     * Map of managers per-world.
+     */
+    private ConcurrentHashMap<String, RegionManager> managers;
+
+    /**
+     * Stores the list of modification dates for the world files. This allows
+     * WorldGuard to reload files as needed.
+     */
+    private HashMap<String, Long> lastModified;
+
+    /**
+     * Construct the object.
+     *
+     * @param plugin The plugin instance
+     */
+    public GlobalRegionManager(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+        config = plugin.getGlobalStateManager();
+        managers = new ConcurrentHashMap<String, RegionManager>();
+        lastModified = new HashMap<String, Long>();
+    }
+
+    /**
+     * Unload region information.
+     */
+    public void unload() {
+        managers.clear();
+        lastModified.clear();
+    }
+
+    /**
+     * Get the path for a world's regions file.
+     *
+     * @param name The name of the world
+     * @return The region file path for a world's region file
+     */
+    protected File getPath(String name) {
+        return new File(plugin.getDataFolder(),
+                "worlds" + File.separator + name + File.separator + "regions.yml");
+    }
+
+    /**
+     * Unload region information for a world.
+     *
+     * @param name The name of the world to unload
+     */
+    public void unload(String name) {
+        RegionManager manager = managers.remove(name);
+
+        if (manager != null) {
+            lastModified.remove(name);
+        }
+    }
+
+    /**
+     * Unload all region information.
+     */
+    public void unloadAll() {
+        managers.clear();
+        lastModified.clear();
+    }
+
+    public RegionManager load(World world) {
+        RegionManager manager = create(world);
+        managers.put(world.getName(), manager);
+        return manager;
+    }
+
+    /**
+     * Load region information for a world.
+     *
+     * @param world The world to load a RegionManager for
+     * @return the loaded RegionManager
+     */
+    public RegionManager create(World world) {
+        String name = world.getName();
+        boolean sql = config.useSqlDatabase;
+        ProtectionDatabase database;
+        File file = null;
+
+        try {
+            if (!sql) {
+                file = getPath(name);
+                database = new YAMLDatabase(file, plugin.getLogger());
+
+                // Store the last modification date so we can track changes
+                lastModified.put(name, file.lastModified());
+            } else {
+                database = new MySQLDatabase(config, name, plugin.getLogger());
+            }
+
+            // Create a manager
+            RegionManager manager = new PRTreeRegionManager(database);
+            manager.load();
+
+            if (plugin.getGlobalStateManager().get(world).summaryOnStart) {
+                plugin.getLogger().info(manager.getRegions().size()
+                        + " regions loaded for '" + name + "'");
+            }
+
+            return manager;
+        } catch (ProtectionDatabaseException e) {
+            String logStr = "Failed to load regions from ";
+            if (sql) {
+                logStr += "SQL Database <" + config.sqlDsn + "> ";
+            } else {
+                logStr += "file \"" + file + "\" ";
+            }
+
+            plugin.getLogger().log(Level.SEVERE, logStr + " : " + e.getMessage());
+            e.printStackTrace();
+        } catch (FileNotFoundException e) {
+            plugin.getLogger().log(Level.SEVERE, "Error loading regions for world \""
+                    + name + "\": " + e.toString() + "\n\t" + e.getMessage());
+            e.printStackTrace();
+        }
+
+        // @TODO: THIS CREATES PROBLEMS!!one!!1!!eleven!!1!!!
+        return null;
+    }
+
+    /**
+     * Preloads region managers for all worlds.
+     */
+    public void preload() {
+        // Load regions
+        for (World world : plugin.getServer().getWorlds()) {
+            load(world);
+        }
+    }
+
+    /**
+     * Reloads the region information from file when region databases
+     * have changed.
+     */
+    public void reloadChanged() {
+        if (config.useSqlDatabase) return;
+
+        for (String name : managers.keySet()) {
+            File file = getPath(name);
+
+            Long oldDate = lastModified.get(name);
+
+            if (oldDate == null) {
+                oldDate = 0L;
+            }
+
+            try {
+                if (file.lastModified() > oldDate) {
+                    World world = plugin.getServer().getWorld(name);
+
+                    if (world != null) {
+                        load(world);
+                    }
+                }
+            } catch (Exception ignore) {
+            }
+        }
+    }
+
+    /**
+     * Get the region manager for a particular world.
+     *
+     * @param world The world to get a RegionManager for
+     * @return The region manager.
+     */
+    public RegionManager get(World world) {
+        RegionManager manager = managers.get(world.getName());
+        RegionManager newManager = null;
+
+        while (manager == null) {
+            if (newManager == null) {
+                newManager = create(world);
+            }
+            managers.putIfAbsent(world.getName(), newManager);
+            manager = managers.get(world.getName());
+        }
+
+        return manager;
+    }
+
+    /**
+     * Returns whether the player can bypass.
+     *
+     * @param player The player to check
+     * @param world The world to check for
+     * @return Whether {@code player} has bypass permission for {@code world}
+     */
+    public boolean hasBypass(LocalPlayer player, World world) {
+        return player.hasPermission("worldguard.region.bypass."
+                        + world.getName());
+    }
+
+    /**
+     * Returns whether the player can bypass.
+     *
+     * @param player The player to check
+     * @param world The world to check
+     * @return Whether {@code player} has bypass permission for {@code world}
+     */
+    public boolean hasBypass(Player player, World world) {
+        return plugin.hasPermission(player, "worldguard.region.bypass."
+                + world.getName());
+    }
+
+    /**
+     * Check if a player has permission to build at a block.
+     *
+     * @param player The player to check
+     * @param block The block to check at
+     * @return Whether {@code player} can build at {@code block}'s location
+     */
+    public boolean canBuild(Player player, Block block) {
+        return canBuild(player, block.getLocation());
+    }
+
+    /**
+     * Check if a player has permission to build at a location.
+     *
+     * @param player The player to check
+     * @param loc The location to check
+     * @return Whether {@code player} can build at {@code loc}
+     */
+    public boolean canBuild(Player player, Location loc) {
+        World world = loc.getWorld();
+        WorldConfiguration worldConfig = config.get(world);
+
+        if (!worldConfig.useRegions) {
+            return true;
+        }
+
+        LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+        if (!hasBypass(player, world)) {
+            RegionManager mgr = get(world);
+
+            if (!mgr.getApplicableRegions(BukkitUtil.toVector(loc))
+                    .canBuild(localPlayer)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public boolean canConstruct(Player player, Block block) {
+        return canConstruct(player, block.getLocation());
+    }
+
+    public boolean canConstruct(Player player, Location loc) {
+        World world = loc.getWorld();
+        WorldConfiguration worldConfig = config.get(world);
+
+        if (!worldConfig.useRegions) {
+            return true;
+        }
+
+        LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+        if (!hasBypass(player, world)) {
+            RegionManager mgr = get(world);
+
+            final ApplicableRegionSet applicableRegions = mgr.getApplicableRegions(BukkitUtil.toVector(loc));
+            if (!applicableRegions.canBuild(localPlayer)) {
+                return false;
+            }
+            if (!applicableRegions.canConstruct(localPlayer)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks to see whether a flag is allowed.
+     *
+     * @see #allows(com.sk89q.worldguard.protection.flags.StateFlag, org.bukkit.Location, com.sk89q.worldguard.LocalPlayer)
+     * @param flag The flag to check
+     * @param loc The location to check the flag at
+     * @return Whether the flag is allowed
+     */
+    public boolean allows(StateFlag flag, Location loc) {
+        return allows(flag, loc, null);
+    }
+
+    /**
+     * Checks to see whether a flag is allowed.
+     *
+     * @param flag The flag to check
+     * @param loc The location to check the flag at
+     * @param player The player to check for the flag's {@link com.sk89q.worldguard.protection.flags.RegionGroup}
+     * @return Whether the flag is allowed
+     */
+    public boolean allows(StateFlag flag, Location loc, LocalPlayer player) {
+        World world = loc.getWorld();
+        WorldConfiguration worldConfig = config.get(world);
+
+        if (!worldConfig.useRegions) {
+            return true;
+        }
+
+        RegionManager mgr = get(world);
+        return mgr.getApplicableRegions(toVector(loc)).allows(flag, player);
+    }
+}

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

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

src/main/java/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java

@@ -0,0 +1,46 @@
+// $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.databases;
+
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+public abstract class AbstractProtectionDatabase implements ProtectionDatabase {
+
+    /**
+     * Load the list of regions into a region manager.
+     * 
+     * @throws ProtectionDatabaseException
+     */
+    public void load(RegionManager manager) throws ProtectionDatabaseException {
+        load();
+        manager.setRegions(getRegions());
+    }
+    
+    /**
+     * Save the list of regions from a region manager.
+     * 
+     * @throws ProtectionDatabaseException
+     */
+    public void save(RegionManager manager) throws ProtectionDatabaseException {
+        setRegions(manager.getRegions());
+        save();
+    }
+    
+}

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

@@ -0,0 +1,357 @@
+// $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.databases;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import au.com.bytecode.opencsv.CSVReader;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag.State;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
+import com.sk89q.worldguard.util.ArrayReader;
+
+/**
+ * Represents a protected area database that uses CSV files.
+ *
+ * @author sk89q
+ */
+public class CSVDatabase extends AbstractProtectionDatabase {
+    
+    private static final Map<String, StateFlag> legacyFlagCodes = new HashMap<String, StateFlag>();
+    static {
+        legacyFlagCodes.put("z", DefaultFlag.PASSTHROUGH);
+        legacyFlagCodes.put("b", DefaultFlag.BUILD);
+        legacyFlagCodes.put("p", DefaultFlag.PVP);
+        legacyFlagCodes.put("m", DefaultFlag.MOB_DAMAGE);
+        legacyFlagCodes.put("c", DefaultFlag.CREEPER_EXPLOSION);
+        legacyFlagCodes.put("t", DefaultFlag.TNT);
+        legacyFlagCodes.put("l", DefaultFlag.LIGHTER);
+        legacyFlagCodes.put("f", DefaultFlag.FIRE_SPREAD);
+        legacyFlagCodes.put("F", DefaultFlag.LAVA_FIRE);
+        legacyFlagCodes.put("C", DefaultFlag.CHEST_ACCESS);
+    }
+
+    private final Logger logger;
+
+    /**
+     * References the CSV file.
+     */
+    private final File file;
+    /**
+     * Holds the list of regions.
+     */
+    private Map<String,ProtectedRegion> regions;
+
+    /**
+     * Construct the database with a path to a file. No file is read or
+     * written at this time.
+     *
+     * @param file The file in CSV format containing the region database
+     * @param logger The logger to log errors to
+     */
+    public CSVDatabase(File file, Logger logger) {
+        this.file = file;
+        this.logger = logger;
+    }
+
+    /**
+     * Saves the database.
+     */
+    public void save() throws ProtectionDatabaseException {
+        throw new UnsupportedOperationException("CSV format is no longer implemented");
+    }
+
+    public void load() throws ProtectionDatabaseException {
+        Map<String,ProtectedRegion> regions =
+                new HashMap<String,ProtectedRegion>();
+        Map<ProtectedRegion,String> parentSets =
+                new LinkedHashMap<ProtectedRegion, String>();
+
+        CSVReader reader = null;
+        try {
+            reader = new CSVReader(new FileReader(file));
+
+            String[] line;
+
+            while ((line = reader.readNext()) != null) {
+                if (line.length < 2) {
+                    logger.warning("Invalid region definition: " + line);
+                    continue;
+                }
+
+                String id = line[0].toLowerCase().replace(".", "");
+                String type = line[1];
+                ArrayReader<String> entries = new ArrayReader<String>(line);
+
+                if (type.equalsIgnoreCase("cuboid")) {
+                    if (line.length < 8) {
+                        logger.warning("Invalid region definition: " + line);
+                        continue;
+                    }
+
+                    Vector pt1 = new Vector(
+                            Integer.parseInt(line[2]),
+                            Integer.parseInt(line[3]),
+                            Integer.parseInt(line[4]));
+                    Vector pt2 = new Vector(
+                            Integer.parseInt(line[5]),
+                            Integer.parseInt(line[6]),
+                            Integer.parseInt(line[7]));
+
+                    BlockVector min = Vector.getMinimum(pt1, pt2).toBlockVector();
+                    BlockVector max = Vector.getMaximum(pt1, pt2).toBlockVector();
+
+                    int priority = entries.get(8) == null ? 0 : Integer.parseInt(entries.get(8));
+                    String ownersData = entries.get(9);
+                    String flagsData = entries.get(10);
+                    //String enterMessage = nullEmptyString(entries.get(11));
+
+                    ProtectedRegion region = new ProtectedCuboidRegion(id, min, max);
+                    region.setPriority(priority);
+                    parseFlags(region, flagsData);
+                    region.setOwners(this.parseDomains(ownersData));
+                    regions.put(id, region);
+                } else if (type.equalsIgnoreCase("cuboid.2")) {
+                    Vector pt1 = new Vector(
+                            Integer.parseInt(line[2]),
+                            Integer.parseInt(line[3]),
+                            Integer.parseInt(line[4]));
+                    Vector pt2 = new Vector(
+                            Integer.parseInt(line[5]),
+                            Integer.parseInt(line[6]),
+                            Integer.parseInt(line[7]));
+
+                    BlockVector min = Vector.getMinimum(pt1, pt2).toBlockVector();
+                    BlockVector max = Vector.getMaximum(pt1, pt2).toBlockVector();
+
+                    int priority = entries.get(8) == null ? 0 : Integer.parseInt(entries.get(8));
+                    String parentId = entries.get(9);
+                    String ownersData = entries.get(10);
+                    String membersData = entries.get(11);
+                    String flagsData = entries.get(12);
+                    //String enterMessage = nullEmptyString(entries.get(13));
+                    //String leaveMessage = nullEmptyString(entries.get(14));
+
+                    ProtectedRegion region = new ProtectedCuboidRegion(id, min, max);
+                    region.setPriority(priority);
+                    parseFlags(region, flagsData);
+                    region.setOwners(this.parseDomains(ownersData));
+                    region.setMembers(this.parseDomains(membersData));
+                    regions.put(id, region);
+
+                    // Link children to parents later
+                    if (parentId.length() > 0) {
+                        parentSets.put(region, parentId);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            throw new ProtectionDatabaseException(e);
+        } finally {
+            try {
+                reader.close();
+            } catch (IOException ignored) {
+            }
+        }
+
+        for (Map.Entry<ProtectedRegion, String> entry : parentSets.entrySet()) {
+            ProtectedRegion parent = regions.get(entry.getValue());
+            if (parent != null) {
+                try {
+                    entry.getKey().setParent(parent);
+                } catch (CircularInheritanceException e) {
+                    logger.warning("Circular inheritance detect with '"
+                            + entry.getValue() + "' detected as a parent");
+                }
+            } else {
+                logger.warning("Unknown region parent: " + entry.getValue());
+            }
+        }
+
+        this.regions = regions;
+    }
+
+    /**
+     * Used to parse the specified domain in the CSV file.
+     *
+     * @param data The domain data as a string
+     * @return The domain data as a DefaultDomain
+     */
+    private DefaultDomain parseDomains(String data) {
+        if (data == null) {
+            return new DefaultDomain();
+        }
+
+        DefaultDomain domain = new DefaultDomain();
+        Pattern pattern = Pattern.compile("^([A-Za-z]):(.*)$");
+
+        String[] parts = data.split(",");
+
+        for (String part : parts) {
+            if (part.trim().length() == 0) {
+                continue;
+            }
+
+            Matcher matcher = pattern.matcher(part);
+
+            if (!matcher.matches()) {
+                logger.warning("Invalid owner specification: " + part);
+                continue;
+            }
+
+            String type = matcher.group(1);
+            String id = matcher.group(2);
+
+            if (type.equals("u")) {
+                domain.addPlayer(id);
+            } else if (type.equals("g")) {
+                domain.addGroup(id);
+            } else {
+                logger.warning("Unknown owner specification: " + type);
+            }
+        }
+
+        return domain;
+    }
+
+    /**
+     * Used to parse the list of flags.
+     *
+     * @param data The flag data in string format
+     */
+    private void parseFlags(ProtectedRegion region, String data) {
+        if (data == null) {
+            return;
+        }
+
+        State curState = State.ALLOW;
+
+        for (int i = 0; i < data.length(); i++) {
+            char k = data.charAt(i);
+            if (k == '+') {
+                curState = State.ALLOW;
+            } else if (k == '-') {
+                curState = State.DENY;
+            } else {
+                String flagStr;
+                if (k == '_') {
+                    if (i == data.length() - 1) {
+                        logger.warning("_ read ahead fail");
+                        break;
+                    }
+                    flagStr = "_" + data.charAt(i + 1);
+                    i++;
+
+                    logger.warning("_? custom flags are no longer supported");
+                    continue;
+                } else {
+                    flagStr = String.valueOf(k);
+                }
+
+                StateFlag flag = legacyFlagCodes.get(flagStr);
+                if (flag != null) {
+                    region.setFlag(flag, curState);
+                } else {
+                    logger.warning("Legacy flag '" + flagStr + "' is unsupported");
+                }
+            }
+        }
+    }
+
+    /**
+     * Used to write the list of domains.
+     *
+     * @param domain
+     * @return
+     */
+/*    private String writeDomains(DefaultDomain domain) {
+        StringBuilder str = new StringBuilder();
+
+        for (String player : domain.getPlayers()) {
+            str.append("u:" + player + ",");
+        }
+
+        for (String group : domain.getGroups()) {
+            str.append("g:" + group + ",");
+        }
+
+        return str.length() > 0 ?
+                str.toString().substring(0, str.length() - 1) : "";
+    }*/
+
+    /**
+     * Helper method to prepend '+' or '-' in front of a flag according
+     * to the flag's state.
+     *
+     * @param state
+     * @param flag
+     * @return
+     */
+/*
+    private String writeFlag(State state, String flag) {
+        if (state == State.ALLOW) {
+            return "+" + flag;
+        } else if (state == State.DENY) {
+            return "-" + flag;
+        }
+
+        return "";
+    }
+*/
+
+    /**
+     * Returns a null if a string is null or empty.
+     *
+     * @param str The string to format
+     * @return null if the string is empty or null, otherwise the provided string
+     */
+    protected String nullEmptyString(String str) {
+        if (str == null) {
+            return null;
+        } else if (str.length() == 0) {
+            return null;
+        } else {
+            return str;
+        }
+    }
+
+    public Map<String,ProtectedRegion> getRegions() {
+        return regions;
+    }
+
+    public void setRegions(Map<String,ProtectedRegion> regions) {
+        this.regions = regions;
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/InvalidTableFormatException.java

@@ -0,0 +1,20 @@
+package com.sk89q.worldguard.protection.databases;
+
+import com.sk89q.worldguard.util.FatalConfigurationLoadingException;
+
+public class InvalidTableFormatException extends FatalConfigurationLoadingException {
+	private static final long serialVersionUID = 1L;
+
+	protected String updateFile;
+
+    public InvalidTableFormatException(String updateFile) {
+        super();
+        
+        this.updateFile = updateFile;
+    }
+    
+    public String toString() {
+    	return "You need to update your database to the latest version.\n" +
+    			"\t\tPlease see " + this.updateFile;
+    }
+}

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

@@ -0,0 +1,72 @@
+// $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.databases;
+
+import java.util.Map;
+
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+/**
+ * Represents a database to read and write lists of regions from and to.
+ *
+ * @author sk89q
+ */
+public interface ProtectionDatabase {
+    /**
+     * Load the list of regions. The method should not modify the list returned
+     * by getRegions() unless the load finishes successfully.
+     *
+     * @throws ProtectionDatabaseException when an error occurs
+     */
+    public void load() throws ProtectionDatabaseException;
+    /**
+     * Save the list of regions.
+     *
+     * @throws ProtectionDatabaseException when an error occurs
+     */
+    public void save() throws ProtectionDatabaseException;
+    /**
+     * Load the list of regions into a region manager.
+     *
+     * @param manager The manager to load regions into
+     * @throws ProtectionDatabaseException when an error occurs
+     */
+    public void load(RegionManager manager) throws ProtectionDatabaseException;
+    /**
+     * Save the list of regions from a region manager.
+     *
+     * @param manager The manager to load regions into
+     * @throws ProtectionDatabaseException when an error occurs
+     */
+    public void save(RegionManager manager) throws ProtectionDatabaseException;
+    /**
+     * Get a list of regions.
+     *
+     * @return the regions loaded by this ProtectionDatabase
+     */
+    public Map<String,ProtectedRegion> getRegions();
+    /**
+     * Set the list of regions.
+     *
+     * @param regions The regions to be applied to this ProtectionDatabase
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions);
+}

src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabaseException.java

@@ -0,0 +1,42 @@
+// $Id$
+/*
+ * WorldGuard ProtectionDatabaseException
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases;
+
+import java.lang.Exception;
+
+public class ProtectionDatabaseException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public ProtectionDatabaseException() {
+        super();
+    }
+
+    public ProtectionDatabaseException(String message) {
+        super(message);
+    }
+
+    public ProtectionDatabaseException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ProtectionDatabaseException(Throwable cause) {
+        super(cause);
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/RegionDBUtil.java

@@ -0,0 +1,133 @@
+// $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.databases;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.sk89q.worldguard.domains.DefaultDomain;
+
+/**
+ * Various utility functions for parsing region databases.
+ * 
+ * @author sk89q
+ */
+public class RegionDBUtil {
+    private static Pattern groupPattern = Pattern.compile("(?i)^[G]:(.+)$");
+    
+    private RegionDBUtil() {
+        
+    }
+
+    /**
+     * Add the given names to {@code domain}
+     * 
+     * @param domain The domain to add to
+     * @param split The {@link String[]} containing names to add to {@code domain}
+     * @param startIndex The beginning index in the array
+     */
+    public static void addToDomain(DefaultDomain domain, String[] split,
+            int startIndex) {
+        for (int i = startIndex; i < split.length; i++) {
+            String s = split[i];
+            Matcher m = groupPattern.matcher(s);
+            if (m.matches()) {
+                domain.addGroup(m.group(1));
+            } else {
+                domain.addPlayer(s);
+            }
+        }
+    }
+
+    /**
+     * Remove the given names from {@code domain}
+     *
+     * @param domain The domain to remove from
+     * @param split The {@link String[]} containing names to remove from {@code domain}
+     * @param startIndex The beginning index in the array
+     */
+    public static void removeFromDomain(DefaultDomain domain, String[] split,
+            int startIndex) {
+        for (int i = startIndex; i < split.length; i++) {
+            String s = split[i];
+            Matcher m = groupPattern.matcher(s);
+            if (m.matches()) {
+                domain.removeGroup(m.group(1));
+            } else {
+                domain.removePlayer(s);
+            }
+        }
+    }
+
+    /**
+     * Parse a group/player DefaultDomain specification for areas.
+     * 
+     * @param split The array of names to add
+     * @param startIndex The beginning index in the array
+     * @return The resulting DefaultDomain
+     */
+    public static DefaultDomain parseDomainString(String[] split, int startIndex) {
+        DefaultDomain domain = new DefaultDomain();
+
+        for (int i = startIndex; i < split.length; i++) {
+            String s = split[i];
+            Matcher m = groupPattern.matcher(s);
+            if (m.matches()) {
+                domain.addGroup(m.group(1));
+            } else {
+                domain.addPlayer(s);
+            }
+        }
+
+        return domain;
+    }
+    
+    /**
+     * Creates a comma separated list of PreparedStatement place holders
+     * 
+     * @param length The number of wildcards to create
+     * @return A string with {@code length} wildcards for usage in a PreparedStatement
+     */
+    public static String preparePlaceHolders(int length) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < length;) {
+            builder.append("?");
+            if (++i < length) {
+                builder.append(",");
+            }
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Adds all of the parsed values to the PreparedStatement
+     * 
+     * @param preparedStatement The preparedStanement to add to
+     * @param values The values to set
+     * @throws SQLException see {@link PreparedStatement#setString(int, String)}
+     */
+    public static void setValues(PreparedStatement preparedStatement, String... values) throws SQLException {
+        for (int i = 0; i < values.length; i++) {
+            preparedStatement.setString(i + 1, values[i]);
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/YAMLDatabase.java

@@ -0,0 +1,315 @@
+// $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.databases;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import com.sk89q.util.yaml.YAMLFormat;
+import com.sk89q.util.yaml.YAMLNode;
+import com.sk89q.util.yaml.YAMLProcessor;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.Vector;
+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.regions.GlobalProtectedRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
+
+public class YAMLDatabase extends AbstractProtectionDatabase {
+    
+    private YAMLProcessor config;
+    private Map<String, ProtectedRegion> regions;
+    private final Logger logger;
+    
+    public YAMLDatabase(File file, Logger logger) throws ProtectionDatabaseException, FileNotFoundException {
+        this.logger = logger;
+        if (!file.exists()) { // shouldn't be necessary, but check anyways
+            try {
+                file.createNewFile();
+            } catch (IOException e) {
+                throw new FileNotFoundException(file.getAbsolutePath());
+            }
+        }
+        config = new YAMLProcessor(file, false, YAMLFormat.COMPACT);
+    }
+
+    public void load() throws ProtectionDatabaseException {
+        try {
+            config.load();
+        } catch (IOException e) {
+            throw new ProtectionDatabaseException(e);
+        }
+        
+        Map<String, YAMLNode> regionData = config.getNodes("regions");
+        
+        // No regions are even configured
+        if (regionData == null) {
+            this.regions = new HashMap<String, ProtectedRegion>();
+            return;
+        }
+
+        Map<String,ProtectedRegion> regions =
+            new HashMap<String,ProtectedRegion>();
+        Map<ProtectedRegion,String> parentSets =
+            new LinkedHashMap<ProtectedRegion, String>();
+        
+        for (Map.Entry<String, YAMLNode> entry : regionData.entrySet()) {
+            String id = entry.getKey().toLowerCase().replace(".", "");
+            YAMLNode node = entry.getValue();
+            
+            String type = node.getString("type");
+            ProtectedRegion region;
+            
+            try {
+                if (type == null) {
+                    logger.warning("Undefined region type for region '" + id + '"');
+                    continue;
+                } else if (type.equals("cuboid")) {
+                    Vector pt1 = checkNonNull(node.getVector("min"));
+                    Vector pt2 = checkNonNull(node.getVector("max"));
+                    BlockVector min = Vector.getMinimum(pt1, pt2).toBlockVector();
+                    BlockVector max = Vector.getMaximum(pt1, pt2).toBlockVector();
+                    region = new ProtectedCuboidRegion(id, min, max);
+                } else if (type.equals("poly2d")) {
+                    Integer minY = checkNonNull(node.getInt("min-y"));
+                    Integer maxY = checkNonNull(node.getInt("max-y"));
+                    List<BlockVector2D> points = node.getBlockVector2dList("points", null);
+                    region = new ProtectedPolygonalRegion(id, points, minY, maxY);
+                } else if (type.equals("global")) {
+                    region = new GlobalProtectedRegion(id);
+                } else {
+                    logger.warning("Unknown region type for region '" + id + '"');
+                    continue;
+                }
+                
+                Integer priority = checkNonNull(node.getInt("priority"));
+                region.setPriority(priority);
+                setFlags(region, node.getNode("flags"));
+                region.setOwners(parseDomain(node.getNode("owners")));
+                region.setMembers(parseDomain(node.getNode("members")));
+                regions.put(id, region);
+                
+                String parentId = node.getString("parent");
+                if (parentId != null) {
+                    parentSets.put(region, parentId);
+                }
+            } catch (NullPointerException e) {
+                logger.warning("Missing data for region '" + id + '"');
+            }
+        }
+        
+        // Relink parents
+        for (Map.Entry<ProtectedRegion, String> entry : parentSets.entrySet()) {
+            ProtectedRegion parent = regions.get(entry.getValue());
+            if (parent != null) {
+                try {
+                    entry.getKey().setParent(parent);
+                } catch (CircularInheritanceException e) {
+                    logger.warning("Circular inheritance detect with '"
+                            + entry.getValue() + "' detected as a parent");
+                }
+            } else {
+                logger.warning("Unknown region parent: " + entry.getValue());
+            }
+        }
+        
+        this.regions = regions;
+    }
+    
+    private <V> V checkNonNull(V val) throws NullPointerException {
+        if (val == null) {
+            throw new NullPointerException();
+        }
+        
+        return val;
+    }
+    
+    private void setFlags(ProtectedRegion region, YAMLNode flagsData) {
+        if (flagsData == null) {
+            return;
+        }
+        
+        // @TODO: Make this better
+        for (Flag<?> flag : DefaultFlag.getFlags()) {
+            Object o = flagsData.getProperty(flag.getName());
+            if (o != null) {
+                setFlag(region, flag, o);
+            }
+            
+            if (flag.getRegionGroupFlag() != null) {
+            Object o2 = flagsData.getProperty(flag.getRegionGroupFlag().getName());
+                if (o2 != null) {
+                    setFlag(region, flag.getRegionGroupFlag(), o2);
+                }
+            }
+        }
+    }
+    
+    private <T> void setFlag(ProtectedRegion region, Flag<T> flag, Object rawValue) {
+        T val = flag.unmarshal(rawValue);
+        if (val == null) {
+            logger.warning("Failed to parse flag '" + flag.getName()
+                    + "' with value '" + rawValue.toString() + "'");
+            return;
+        }
+        region.setFlag(flag, val);
+    }
+    
+    private DefaultDomain parseDomain(YAMLNode node) {
+        if (node == null) {
+            return new DefaultDomain();
+        }
+        
+        DefaultDomain domain = new DefaultDomain();
+        
+        for (String name : node.getStringList("players", null)) {
+            domain.addPlayer(name);
+        }
+        
+        for (String name : node.getStringList("groups", null)) {
+            domain.addGroup(name);
+        }
+        
+        return domain;
+    }
+
+    public void save() throws ProtectionDatabaseException {
+        config.clear();
+        
+        for (Map.Entry<String, ProtectedRegion> entry : regions.entrySet()) {
+            ProtectedRegion region = entry.getValue();
+            YAMLNode node = config.addNode("regions." + entry.getKey());
+            
+            if (region instanceof ProtectedCuboidRegion) {
+                ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion) region;
+                node.setProperty("type", "cuboid");
+                node.setProperty("min", cuboid.getMinimumPoint());
+                node.setProperty("max", cuboid.getMaximumPoint());
+            } else if (region instanceof ProtectedPolygonalRegion) {
+                ProtectedPolygonalRegion poly = (ProtectedPolygonalRegion) region;
+                node.setProperty("type", "poly2d");
+                node.setProperty("min-y", poly.getMinimumPoint().getBlockY());
+                node.setProperty("max-y", poly.getMaximumPoint().getBlockY());
+                
+                List<Map<String, Object>> points = new ArrayList<Map<String,Object>>();
+                for (BlockVector2D point : poly.getPoints()) {
+                    Map<String, Object> data = new HashMap<String, Object>();
+                    data.put("x", point.getBlockX());
+                    data.put("z", point.getBlockZ());
+                    points.add(data);
+                }
+                
+                node.setProperty("points", points);
+            } else if (region instanceof GlobalProtectedRegion) {
+                node.setProperty("type", "global");
+            } else {
+                node.setProperty("type", region.getClass().getCanonicalName());
+            }
+
+            node.setProperty("priority", region.getPriority());
+            node.setProperty("flags", getFlagData(region));
+            node.setProperty("owners", getDomainData(region.getOwners()));
+            node.setProperty("members", getDomainData(region.getMembers()));
+            ProtectedRegion parent = region.getParent();
+            if (parent != null) {
+                node.setProperty("parent", parent.getId());
+            }
+        }
+        
+        config.setHeader("#\r\n" +
+                "# WorldGuard regions file\r\n" +
+                "#\r\n" +
+                "# WARNING: THIS FILE IS AUTOMATICALLY GENERATED. If you modify this file by\r\n" +
+                "# hand, be aware that A SINGLE MISTYPED CHARACTER CAN CORRUPT THE FILE. If\r\n" +
+                "# WorldGuard is unable to parse the file, your regions will FAIL TO LOAD and\r\n" +
+                "# the contents of this file will reset. Please use a YAML validator such as\r\n" +
+                "# http://yaml-online-parser.appspot.com (for smaller files).\r\n" +
+                "#\r\n" +
+                "# REMEMBER TO KEEP PERIODICAL BACKUPS.\r\n" +
+                "#");
+        config.save();
+    }
+    
+    private Map<String, Object> getFlagData(ProtectedRegion region) {
+        Map<String, Object> flagData = new HashMap<String, Object>();
+        
+        for (Map.Entry<Flag<?>, Object> entry : region.getFlags().entrySet()) {
+            Flag<?> flag = entry.getKey();
+            addMarshalledFlag(flagData, flag, entry.getValue());
+        }
+        
+        return flagData;
+    }
+    
+    @SuppressWarnings("unchecked")
+    private <V> void addMarshalledFlag(Map<String, Object> flagData,
+            Flag<V> flag, Object val) {
+        if (val == null) {
+            return;
+        }
+        flagData.put(flag.getName(), flag.marshal((V) val));
+    }
+    
+    private Map<String, Object> getDomainData(DefaultDomain domain) {
+        Map<String, Object> domainData = new HashMap<String, Object>();
+
+        setDomainData(domainData, "players", domain.getPlayers());
+        setDomainData(domainData, "groups", domain.getGroups());
+        
+        return domainData;
+    }
+    
+    private void setDomainData(Map<String, Object> domainData,
+            String key, Set<String> domain) {
+        if (domain.size() == 0) {
+            return;
+        }
+        
+        List<String> list = new ArrayList<String>();
+        
+        for (String str : domain) {
+            list.add(str);
+        }
+        
+        domainData.put(key, list);
+    }
+
+    public Map<String, ProtectedRegion> getRegions() {
+        return regions;
+    }
+
+    public void setRegions(Map<String, ProtectedRegion> regions) {
+        this.regions = regions;
+    }
+    
+}

src/main/java/com/sk89q/worldguard/protection/databases/migrators/AbstractDatabaseMigrator.java

@@ -0,0 +1,62 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+public abstract class AbstractDatabaseMigrator implements DatabaseMigrator {
+
+    private static HashMap<MigratorKey, Class<? extends AbstractDatabaseMigrator>> migrators =
+            new HashMap<MigratorKey, Class<? extends AbstractDatabaseMigrator>>();
+
+    public static Map<MigratorKey, Class<? extends AbstractDatabaseMigrator>> getMigrators() {
+        if (!migrators.isEmpty()) return migrators;
+
+        AbstractDatabaseMigrator.migrators.put(new MigratorKey("mysql", "yaml"), MySQLToYAMLMigrator.class);
+        AbstractDatabaseMigrator.migrators.put(new MigratorKey("yaml", "mysql"), YAMLToMySQLMigrator.class);
+
+        return migrators;
+    }
+
+    protected abstract Set<String> getWorldsFromOld() throws MigrationException;
+
+    protected abstract Map<String, ProtectedRegion> getRegionsForWorldFromOld(String world) throws MigrationException;
+
+    protected abstract ProtectionDatabase getNewWorldStorage(String world) throws MigrationException;
+
+    public void migrate() throws MigrationException {
+        for (String world : this.getWorldsFromOld()) {
+            ProtectionDatabase database = this.getNewWorldStorage(world);
+            database.setRegions(this.getRegionsForWorldFromOld(world));
+
+            try {
+                database.save();
+            } catch (ProtectionDatabaseException e) {
+                throw new MigrationException(e);
+            }
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/migrators/DatabaseMigrator.java

@@ -0,0 +1,31 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+/**
+ * Represents a method of converting from one database to another.
+ *
+ * @author Nicholas Steicke
+ */
+public interface DatabaseMigrator {
+
+    public void migrate() throws MigrationException;
+}
+

src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigrationException.java

@@ -0,0 +1,40 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+public class MigrationException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public MigrationException() {
+        super();
+    }
+
+    public MigrationException(String message) {
+        super(message);
+    }
+
+    public MigrationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public MigrationException(Throwable cause) {
+        super(cause);
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigratorKey.java

@@ -0,0 +1,43 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+public class MigratorKey {
+    public final String from;
+    public final String to;
+
+    public MigratorKey(String from, String to) {
+        this.from = from;
+        this.to = to;
+    }
+
+    public boolean equals(Object o) {
+        MigratorKey other = (MigratorKey) o;
+
+        return other.from.equals(this.from) && other.to.equals(this.to);
+    }
+
+    public int hashCode() {
+        int hash = 17;
+        hash = hash * 31 + this.from.hashCode();
+        hash = hash * 31 + this.to.hashCode();
+        return hash;
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java

@@ -0,0 +1,97 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.databases.MySQLDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.YAMLDatabase;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class MySQLToYAMLMigrator extends AbstractDatabaseMigrator {
+
+    private WorldGuardPlugin plugin;
+    private Set<String> worlds;
+
+    public MySQLToYAMLMigrator(WorldGuardPlugin plugin) throws MigrationException {
+        this.plugin = plugin;
+        this.worlds = new HashSet<String>();
+
+        ConfigurationManager config = plugin.getGlobalStateManager();
+
+        try {
+            Connection conn = DriverManager.getConnection(config.sqlDsn, config.sqlUsername, config.sqlPassword);
+
+            ResultSet worlds = conn.prepareStatement("SELECT `name` FROM `world`;").executeQuery();
+
+            while(worlds.next()) {
+                this.worlds.add(worlds.getString(1));
+            }
+
+            conn.close();
+        } catch (SQLException e) {
+            throw new MigrationException(e);
+        }
+    }
+
+    @Override
+    protected Set<String> getWorldsFromOld() {
+        return this.worlds;
+    }
+
+    @Override
+    protected Map<String, ProtectedRegion> getRegionsForWorldFromOld(String world) throws MigrationException {
+        ProtectionDatabase oldDatabase;
+        try {
+            oldDatabase = new MySQLDatabase(plugin.getGlobalStateManager(), world, plugin.getLogger());
+            oldDatabase.load();
+        } catch (ProtectionDatabaseException e) {
+            throw new MigrationException(e);
+        }
+
+        return oldDatabase.getRegions();
+    }
+
+    @Override
+    protected ProtectionDatabase getNewWorldStorage(String world) throws MigrationException {
+        try {
+            File file = new File(plugin.getDataFolder(),
+                    "worlds" + File.separator + world + File.separator + "regions.yml");
+
+            return new YAMLDatabase(file, plugin.getLogger());
+        } catch (FileNotFoundException e) {
+            throw new MigrationException(e);
+        } catch (ProtectionDatabaseException e) {
+            throw new MigrationException(e);
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java

@@ -0,0 +1,86 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.databases.MySQLDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.YAMLDatabase;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class YAMLToMySQLMigrator extends AbstractDatabaseMigrator {
+
+    private WorldGuardPlugin plugin;
+    private HashMap<String,File> regionYamlFiles;
+
+    public YAMLToMySQLMigrator(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+
+        this.regionYamlFiles = new HashMap<String,File>();
+
+        File files[] = new File(plugin.getDataFolder(), "worlds" + File.separator).listFiles();
+        for (File item : files) {
+            if (item.isDirectory()) {
+                for (File subItem : item.listFiles()) { 
+                    if (subItem.getName().equals("regions.yml")) {
+                        this.regionYamlFiles.put(item.getName(), subItem);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    protected Set<String> getWorldsFromOld() {
+        return this.regionYamlFiles.keySet();
+    }
+
+    @Override
+    protected Map<String, ProtectedRegion> getRegionsForWorldFromOld(String world) throws MigrationException {
+        ProtectionDatabase oldDatabase;
+        try {
+            oldDatabase = new YAMLDatabase(this.regionYamlFiles.get(world), plugin.getLogger());
+            oldDatabase.load();
+        } catch (FileNotFoundException e) {
+            throw new MigrationException(e);
+        } catch (ProtectionDatabaseException e) {
+            throw new MigrationException(e);
+        }
+
+        return oldDatabase.getRegions();
+    }
+
+    @Override
+    protected ProtectionDatabase getNewWorldStorage(String world) throws MigrationException {
+        try {
+            return new MySQLDatabase(plugin.getGlobalStateManager(), world, plugin.getLogger());
+        } catch (ProtectionDatabaseException e) {
+            throw new MigrationException(e);
+        }
+    }
+
+}

src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java

@@ -1,81 +1,82 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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.protection.events;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-/**
- * This event is fired when PVP is disallowed between players due to a "pvp deny" flag.
- * Cancelling this event allows the PVP in spite of this.
- * 
- * @author Score_Under
- */
-public class DisallowedPVPEvent extends Event implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-
-    private boolean cancelled = false;
-    private final Player attacker;
-    private final Player defender;
-    private final Event event;
-
-    public DisallowedPVPEvent(final Player attacker, final Player defender, Event event) {
-        this.attacker = attacker;
-        this.defender = defender;
-        this.event = event;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    /**
-     * @return the attacking player.
-     */
-    public Player getAttacker() {
-        return attacker;
-    }
-
-    /**
-     * @return the defending player.
-     */
-    public Player getDefender() {
-        return defender;
-    }
-
-    public Event getCause() {
-        return event;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}
+// $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.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+/**
+ * This event is fired when PVP is disallowed between players due to a "pvp deny" flag.
+ * Cancelling this event allows the PVP in spite of this.
+ * 
+ * @author Score_Under
+ */
+public class DisallowedPVPEvent extends Event implements Cancellable {
+    private static final HandlerList handlers = new HandlerList();
+
+    private boolean cancelled = false;
+    private final Player attacker;
+    private final Player defender;
+    private final EntityDamageByEntityEvent event;
+
+    public DisallowedPVPEvent(final Player attacker, final Player defender, EntityDamageByEntityEvent event) {
+        this.attacker = attacker;
+        this.defender = defender;
+        this.event = event;
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    /**
+     * @return the attacking player.
+     */
+    public Player getAttacker() {
+        return attacker;
+    }
+
+    /**
+     * @return the defending player.
+     */
+    public Player getDefender() {
+        return defender;
+    }
+
+    public EntityDamageByEntityEvent getCause() {
+        return event;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}

src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java

@@ -1,70 +1,71 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) 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 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 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.protection.flags;
-
-import org.bukkit.command.CommandSender;
-
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-
-/**
- * A boolean flag.
- */
-public class BooleanFlag extends Flag<Boolean> {
-
-    public BooleanFlag(String name, RegionGroup defaultGroup) {
-        super(name, defaultGroup);
-    }
-
-    public BooleanFlag(String name) {
-        super(name);
-    }
-
-    @Override
-    public Boolean parseInput(FlagContext context) throws InvalidFlagFormat {
-        String input = context.getUserInput();
-        
-        if (input.equalsIgnoreCase("true") || input.equalsIgnoreCase("yes")
-                || input.equalsIgnoreCase("on")
-                || input.equalsIgnoreCase("1")) {
-            return true;
-        } else if (input.equalsIgnoreCase("false") || input.equalsIgnoreCase("no")
-                || input.equalsIgnoreCase("off")
-                || input.equalsIgnoreCase("0")) {
-            return false;
-        } else {
-            throw new InvalidFlagFormat("Not a yes/no value: " + input);
-        }
-    }
-
-    @Override
-    public Boolean unmarshal(Object o) {
-        if (o instanceof Boolean) {
-            return (Boolean) o;
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public Object marshal(Boolean o) {
-        return o;
-    }
-    
-}
+// $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 BooleanFlag extends Flag<Boolean> {
+
+    public BooleanFlag(String name, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
+    }
+
+    public BooleanFlag(String name) {
+        super(name);
+    }
+
+    @Override
+    public Boolean parseInput(WorldGuardPlugin plugin, CommandSender sender,
+            String input) throws InvalidFlagFormat {
+        input = input.trim();
+        
+        if (input.equalsIgnoreCase("true") || input.equalsIgnoreCase("yes")
+                || input.equalsIgnoreCase("on")
+                || input.equalsIgnoreCase("1")) {
+            return true;
+        } else if (input.equalsIgnoreCase("false") || input.equalsIgnoreCase("no")
+                || input.equalsIgnoreCase("off")
+                || input.equalsIgnoreCase("0")) {
+            return false;
+        } else {
+            throw new InvalidFlagFormat("Not a yes/no value: " + input);
+        }
+    }
+
+    @Override
+    public Boolean unmarshal(Object o) {
+        if (o instanceof Boolean) {
+            return (Boolean) o;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Object marshal(Boolean o) {
+        return o;
+    }
+    
+}