[maven-release-plugin] prepare release 5.7.5

Update CHANGELOG for 5.7.4 and 5.7.5
Large patch with lots of changes and fixes.
2013-05-26 17:20:00 -04:00 · 2013-05-26 17:10:35 -04:00 · 2013-05-26 17:08:51 -04:00 · 2013-05-15 07:56:04 -04:00 · 2013-05-05 10:57:46 -04:00 · 2013-05-04 11:47:43 +03:00
19 changed files with 1623 additions and 899 deletions
@@ -1,3 +1,50 @@
+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.
@@ -23,8 +70,6 @@
    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.
- Added a texture-pack flag that sends players a texture pack url when in
-    certain regions.

 Thank you to thvortex, Dilandau, tophathacker, and Dark_arc for their contributions this release.

@@ -523,4 +568,4 @@ EduardBaer, TomyLobo, and halvors
 - Added block lag fix.

 1.0
- Initial release.
+- Initial release.
@@ -1,240 +1,319 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.sk89q</groupId>
-  <artifactId>worldguard</artifactId>
-  <version>5.7</version>
-  <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>
-  <scm>
-    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
-    <url>https://github.com/sk89q/worldguard</url>
-    <tag>master</tag>
-    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
-  </scm>
-  <properties>
-    <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.4.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.4.5-R1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>commandbook</artifactId>
-      <version>2.1</version>
-      <scope>compile</scope>
-      <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>
-    </dependency>
-    <dependency>
-      <groupId>org.khelekore</groupId>
-      <artifactId>prtree</artifactId>
-      <version>1.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.opencsv</groupId>
-      <artifactId>opencsv</artifactId>
-      <version>2.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <site>
-      <id>sk89q-docs-upload</id>
-      <url>ftp://sk89q-maven-deploy/worldguard/</url>
-    </site>
-  </distributionManagement>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-    
-    <extensions>
-      <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.2.2</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>
-</project>
+<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.7.5</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>
+  </distributionManagement>
+  
+  <properties> <!-- Fix encoding warnings -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
+  <repositories>
+    <repository>
+      <id>sk89q-repo</id>
+      <url>http://maven.sk89q.com/repo/</url>
+    </repository>
+    <repository>
+      <id>zml-repo</id>
+      <url>http://files.zachsthings.com/repo</url>
+    </repository>
+    <repository>
+      <id>bukkit-repo</id>
+      <url>http://repo.bukkit.org/content/groups/public</url>
+    </repository>
+  </repositories>
+  
+  <dependencies>
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>worldedit</artifactId>
+      <version>5.5.3</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.5-R0.1-SNAPSHOT</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>commandbook</artifactId>
+      <version>2.1</version>
+      <scope>compile</scope>
+      <type>jar</type>
+      <exclusions>
+        <exclusion>
+          <groupId>com.zachsthings.libcomponents</groupId>
+          <artifactId>libcomponents-bukkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.spout</groupId>
+          <artifactId>spoutapi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.nijikokun</groupId>
+      <artifactId>iconomy</artifactId>
+      <version>5.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.khelekore</groupId>
+      <artifactId>prtree</artifactId>
+      <version>1.5.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>net.sf.opencsv</groupId>
+      <artifactId>opencsv</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    
+    <extensions> <!-- Used for uploading the docs -->
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+         <artifactId>wagon-ftp</artifactId>
+         <version>1.0-beta-6</version>
+      </extension>
+    </extensions>
+
+    <resources>
+      <resource>
+        <targetPath>.</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources/</directory>
+        <includes>
+          <include>plugin.yml</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>defaults/</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources/</directory>
+        <includes>
+          <include>config.yml</include>
+          <include>config_world.yml</include>
+          <include>blacklist.txt</include>
+        </includes>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <archive>
+            <addMavenDescriptor>true</addMavenDescriptor>
+            <manifest>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Class-Path>WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>net.sf.opencsv:opencsv</include>
+                  <include>org.khelekore:prtree</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <configuration>
+          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
+        </configuration>
+        <executions>
+          <execution>
+            <id>release</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.2.2</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>
@@ -119,7 +119,11 @@ public class FlagStateManager implements Runnable {
            return;
        }
        if (minHealth == null) minHealth = 0;
-        if (maxHealth == null) maxHealth = 20;
+        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;
@@ -158,6 +162,10 @@ public class FlagStateManager implements Runnable {
        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;
        }
@@ -75,6 +75,7 @@ public class WorldConfiguration {
    private ChestProtection chestProtection = new SignChestProtection();

    /* Configuration data start */
+    public boolean summaryOnStart;
    public boolean opPermissions;
    public boolean fireSpreadDisableToggle;
    public boolean itemDurability;
@@ -158,6 +159,7 @@ public class WorldConfiguration {
    public boolean disableLeafDecay;
    public boolean disableGrassGrowth;
    public boolean disableMyceliumSpread;
+    public boolean disableVineGrowth;
    public boolean disableEndermanGriefing;
    public boolean regionInvinciblityRemovesMobs;
    public boolean disableDeathMessages;
@@ -189,7 +191,9 @@ public class WorldConfiguration {
        config = new YAMLProcessor(configFile, true, YAMLFormat.EXTENDED);
        loadConfiguration();

-        plugin.getLogger().info("Loaded configuration for world '" + worldName + "'");
+        if (summaryOnStart) {
+            plugin.getLogger().info("Loaded configuration for world '" + worldName + "'");
+        }
    }

    private boolean getBoolean(String node, boolean def) {
@@ -295,6 +299,7 @@ public class WorldConfiguration {
            e.printStackTrace();
        }

+        summaryOnStart = getBoolean("summary-on-start", true);
        opPermissions = getBoolean("op-permissions", true);

        itemDurability = getBoolean("protection.item-durability", true);
@@ -392,6 +397,7 @@ public class WorldConfiguration {
        disableLeafDecay = getBoolean("dynamics.disable-leaf-decay", false);
        disableGrassGrowth = getBoolean("dynamics.disable-grass-growth", false);
        disableMyceliumSpread = getBoolean("dynamics.disable-mycelium-spread", false);
+        disableVineGrowth = getBoolean("dynamics.disable-vine-growth", false);

        useRegions = getBoolean("regions.enable", true);
        regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
@@ -464,7 +470,9 @@ public class WorldConfiguration {
                this.blacklist = null;
            } else {
                this.blacklist = blist;
-                plugin.getLogger().log(Level.INFO, "Blacklist loaded.");
+                if (summaryOnStart) {
+                    plugin.getLogger().log(Level.INFO, "Blacklist loaded.");
+                }

                BlacklistLogger blacklistLogger = blist.getLogger();

@@ -490,7 +498,7 @@ public class WorldConfiguration {
        }

        // Print an overview of settings
-        if (getBoolean("summary-on-start", true)) {
+        if (summaryOnStart) {
            plugin.getLogger().log(Level.INFO, blockTNTExplosions
                    ? "(" + worldName + ") TNT ignition is blocked."
                    : "(" + worldName + ") TNT ignition is PERMITTED.");
@@ -33,6 +33,7 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockBurnEvent;
 import org.bukkit.event.block.BlockDamageEvent;
 import org.bukkit.event.block.BlockDispenseEvent;
+import org.bukkit.event.block.BlockExpEvent;
 import org.bukkit.event.block.BlockFadeEvent;
 import org.bukkit.event.block.BlockFormEvent;
 import org.bukkit.event.block.BlockFromToEvent;
@@ -139,7 +140,7 @@ public class WorldGuardBlockListener implements Listener {
            if (held.getTypeId() > 0
                    && !(ItemType.usesDamageValue(held.getTypeId())
                    || BlockType.usesData(held.getTypeId()))) {
-                held.setDurability((short) -1);
+                held.setDurability((short) 0);
                player.setItemInHand(held);
            }
        }
@@ -339,10 +340,6 @@ public class WorldGuardBlockListener implements Listener {
                LocalPlayer localPlayer = plugin.wrapPlayer(player);

                if (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL) {
-                    if (!set.canBuild(localPlayer)) {
-                        event.setCancelled(true);
-                        return;
-                    }
                    if (!set.allows(DefaultFlag.LIGHTER, localPlayer)
                            && !plugin.hasPermission(player, "worldguard.override.lighter")) {
                        event.setCancelled(true);
@@ -760,6 +757,20 @@ public class WorldGuardBlockListener implements Listener {
                return;
            }
        }
+
+        if (fromType == BlockID.VINE) {
+            if (wcfg.disableVineGrowth) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(
+                            DefaultFlag.VINE_GROWTH, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
    }

    /*
@@ -858,4 +869,18 @@ public class WorldGuardBlockListener implements Listener {
            }
        }
    }
+
+    /*
+     * Called when a block yields exp
+     */
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockExp(BlockExpEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getBlock().getLocation())) {
+            event.setExpToDrop(0);
+        }
+    }
+
 }
@@ -24,7 +24,6 @@ import java.util.Set;

 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Creature;
@@ -36,11 +35,14 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.ThrownPotion;
+import org.bukkit.entity.Wither;
+import org.bukkit.entity.WitherSkull;
 import org.bukkit.entity.Wolf;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -60,6 +62,7 @@ import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityInteractEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.ExpBottleEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PigZapEvent;
@@ -86,9 +89,8 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
 public class WorldGuardEntityListener implements Listener {

    private WorldGuardPlugin plugin;
-    private EntityType fireballType;
-    private EntityType witherType;
-    private EntityType witherSkullType;
+
+    private EntityType tntMinecartType;

    /**
     * Construct the object;
@@ -97,10 +99,7 @@ public class WorldGuardEntityListener implements Listener {
     */
    public WorldGuardEntityListener(WorldGuardPlugin plugin) {
        this.plugin = plugin;
-
-        fireballType = BukkitUtil.tryEnum(EntityType.class, "LARGE_FIREBALL", "FIREBALL");
-        witherType = BukkitUtil.tryEnum(EntityType.class, "WITHER");
-        witherSkullType = BukkitUtil.tryEnum(EntityType.class, "WITHER_SKULL");
+        tntMinecartType = BukkitUtil.tryEnum(EntityType.class, "MINECART_TNT");
    }

    /**
@@ -119,12 +118,24 @@ public class WorldGuardEntityListener implements Listener {
        WorldConfiguration wcfg = cfg.get(entity.getWorld());

        if (block.getTypeId() == BlockID.SOIL) {
-            if (entity instanceof Creature && wcfg.disableCreatureCropTrampling) {
+            if (/* entity instanceof Creature && // catch for any entity (not thrown for players) */
+                wcfg.disableCreatureCropTrampling) {
                event.setCancelled(true);
            }
        }
    }

+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onExpBottle(ExpBottleEvent event) {
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getEntity().getWorld());
+
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getEntity().getLocation())) {
+            event.setExperience(0);
+            // event.setShowEffect(false); // don't want to cancel the bottle entirely I suppose, just the exp
+        }
+    }
+
    @EventHandler(priority = EventPriority.HIGH)
    public void onEntityDeath(EntityDeathEvent event) {
        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getEntity().getWorld());
@@ -181,7 +192,19 @@ public class WorldGuardEntityListener implements Listener {
                return;
            }

-            if (wcfg.disableExplosionDamage && type == DamageCause.BLOCK_EXPLOSION) {
+            if (type == DamageCause.BLOCK_EXPLOSION
+                    && (wcfg.disableExplosionDamage || wcfg.blockOtherExplosions
+                            || !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, player.getLocation()))) {
+                event.setCancelled(true);
+                return;
+            }
+        } else {
+
+            // for whatever reason, plugin-caused explosions with a null entity count as block explosions and aren't
+            // handled anywhere else
+            if (type == DamageCause.BLOCK_EXPLOSION
+                    && (wcfg.blockOtherExplosions
+                            || !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, defender.getLocation()))) {
                event.setCancelled(true);
                return;
            }
@@ -265,7 +288,7 @@ public class WorldGuardEntityListener implements Listener {
                    }
                }

-                if (attacker instanceof TNTPrimed) {
+                if (attacker instanceof TNTPrimed || attacker.getType() == tntMinecartType) {

                    // The check for explosion damage should be handled already... But... What ever...
                    if (wcfg.blockTNTExplosions) {
@@ -284,9 +307,16 @@ public class WorldGuardEntityListener implements Listener {
                }

                if (attacker instanceof Fireball) {
-                    if (wcfg.blockFireballExplosions) {
-                        event.setCancelled(true);
-                        return;
+                    if (attacker instanceof WitherSkull) {
+                        if (wcfg.blockWitherSkullExplosions) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    } else {
+                        if (wcfg.blockFireballExplosions) {
+                            event.setCancelled(true);
+                            return;
+                        }
                    }
                    if (wcfg.useRegions) {
                        Fireball fireball = (Fireball) attacker;
@@ -326,7 +356,7 @@ public class WorldGuardEntityListener implements Listener {
                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);

-                        if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
+                        if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer) && !(attacker instanceof Tameable)) {
                            event.setCancelled(true);
                            return;
                        }
@@ -337,6 +367,24 @@ public class WorldGuardEntityListener implements Listener {
                                return;
                            }
                        }
+                        if (attacker instanceof Tameable) {
+                            if (((Tameable) attacker).getOwner() == null) {
+                                if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
+                                    event.setCancelled(true);
+                                    return;
+                                }
+                            }
+                            if (!(((Tameable) attacker).getOwner() instanceof Player)) {
+                                return;
+                            }
+                            Player beastMaster = (Player) ((Tameable) attacker).getOwner();
+                            Vector pt2 = toVector(attacker.getLocation());
+                            if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer(beastMaster))) {
+                                tryCancelPVPEvent(beastMaster, player, event, true);
+                            } else if (!set.allows(DefaultFlag.PVP, localPlayer)) {
+                                tryCancelPVPEvent(beastMaster, player, event, false);
+                            }
+                        }
                    }

                }
@@ -531,128 +579,110 @@ public class WorldGuardEntityListener implements Listener {
            return;
        }

-        // Not all explosions come from an entity
-        if (ent != null) {
-            if (ent.getType() == witherType) {
-                if (wcfg.blockWitherBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.blockWitherExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
+        if (ent instanceof Creeper) {
+            if (wcfg.blockCreeperExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.blockCreeperBlockDamage) {
+                event.blockList().clear();
+                return;
            }

-            if (ent.getType() == witherSkullType) {
-                if (wcfg.blockWitherSkullBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);

+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.CREEPER_EXPLOSION)) {
+                        event.blockList().clear();
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof EnderDragon) {
+            if (wcfg.blockEnderDragonBlockDamage) {
+                event.blockList().clear();
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.ENDERDRAGON_BLOCK_DAMAGE)) {
+                        event.blockList().clear();
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof TNTPrimed || (ent != null && ent.getType() == tntMinecartType)) {
+            if (wcfg.blockTNTExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.blockTNTBlockDamage) {
+                event.blockList().clear();
+                return;
+            }
+
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.TNT)) {
+                        event.blockList().clear();
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof Fireball) {
+            if (ent instanceof WitherSkull) {
                if (wcfg.blockWitherSkullExplosions) {
                    event.setCancelled(true);
                    return;
                }
-            }
-
-            if (ent instanceof Creeper) {
-                if (wcfg.blockCreeperBlockDamage) {
+                if (wcfg.blockWitherSkullBlockDamage) {
                    event.blockList().clear();
-                    event.setCancelled(true);
                    return;
                }
-
-                if (wcfg.blockCreeperExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    if (wcfg.useRegions) {
-                        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                        for (Block block : event.blockList()) {
-                            if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.CREEPER_EXPLOSION)) {
-                                event.blockList().clear();
-                                event.setCancelled(true);
-                                return;
-                            }
-                        }
-                    }
-                }
-            } else if (ent instanceof EnderDragon) {
-                if (wcfg.blockEnderDragonBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                    for (Block block : event.blockList()) {
-                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.ENDERDRAGON_BLOCK_DAMAGE)) {
-                            event.blockList().clear();
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-                }
-            } else if (ent instanceof TNTPrimed) {
-                if (wcfg.blockTNTBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.blockTNTExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                    for (Block block : event.blockList()) {
-                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.TNT)) {
-                            event.blockList().clear();
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-                }
-            } else if (ent instanceof Fireball) {
-                if (wcfg.blockFireballBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
-
+            } else {
                if (wcfg.blockFireballExplosions) {
                    event.setCancelled(true);
                    return;
                }
+                if (wcfg.blockFireballBlockDamage) {
+                    event.blockList().clear();
+                    return;
+                }
+            }
+            // allow wither skull blocking since there is no dedicated flag atm
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);

-                if (wcfg.useRegions) {
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                    for (Block block : event.blockList()) {
-                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.GHAST_FIREBALL)) {
-                            event.blockList().clear();
-                            event.setCancelled(true);
-                            return;
-                        }
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.GHAST_FIREBALL)) {
+                        event.blockList().clear();
+                        event.setCancelled(true);
+                        return;
                    }
                }
            }
-        } else {
-            // null entity, caused by another plugin or so
-            if (wcfg.blockOtherExplosions) {
+        } else if (ent instanceof Wither) {
+            if (wcfg.blockWitherExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.blockWitherBlockDamage) {
                event.blockList().clear();
+                return;
+            }
+        } else {
+            // unhandled entity
+            if (wcfg.blockOtherExplosions) {
                event.setCancelled(true);
                return;
            }
@@ -660,13 +690,14 @@ public class WorldGuardEntityListener implements Listener {
                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
                for (Block block : event.blockList()) {
                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.OTHER_EXPLOSION)) {
-                        event.blockList().clear();
+                        event.setCancelled(true);
                        return;
                    }
                }
            }
        }

+
        if (wcfg.signChestProtection) {
            for (Block block : event.blockList()) {
                if (wcfg.isChestProtected(block)) {
@@ -693,31 +724,28 @@ public class WorldGuardEntityListener implements Listener {
            return;
        }

-        if (event.getEntityType() == witherType) {
+        if (event.getEntityType() == EntityType.WITHER) {
            if (wcfg.blockWitherExplosions) {
                event.setCancelled(true);
                return;
            }
-        }
-        else if (event.getEntityType() == witherSkullType) {
+        } else if (event.getEntityType() == EntityType.WITHER_SKULL) {
            if (wcfg.blockWitherSkullExplosions) {
                event.setCancelled(true);
                return;
            }
-        }
-        else if (event.getEntityType() == fireballType) {
+        } else if (event.getEntityType() == EntityType.FIREBALL) {
            if (wcfg.blockFireballExplosions) {
                event.setCancelled(true);
                return;
            }
-        }
-        else if (event.getEntityType() == EntityType.CREEPER) {
+        } else if (event.getEntityType() == EntityType.CREEPER) {
            if (wcfg.blockCreeperExplosions) {
                event.setCancelled(true);
                return;
            }
-        }
-        else if (event.getEntityType() == EntityType.PRIMED_TNT) {
+        } else if (event.getEntityType() == EntityType.PRIMED_TNT
+                || event.getEntityType() == tntMinecartType) {
            if (wcfg.blockTNTExplosions) {
                event.setCancelled(true);
                return;
@@ -783,7 +811,7 @@ public class WorldGuardEntityListener implements Listener {

        switch (event.getEntityType()) {
            case ENDER_DRAGON:
-                if (wcfg.blockEnderDragonBlockDamage) event.setCancelled(true);
+                if (wcfg.blockEnderDragonPortalCreation) event.setCancelled(true);
                break;
        }
    }
@@ -829,7 +857,7 @@ public class WorldGuardEntityListener implements Listener {
     * @param event Relevant event details
     */
    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onEndermanPickup(EntityChangeBlockEvent event) {
+    public void onEntityChangeBlock(EntityChangeBlockEvent event) {
        Entity ent = event.getEntity();
        Block block = event.getBlock();
        Location location = block.getLocation();
@@ -837,37 +865,18 @@ public class WorldGuardEntityListener implements Listener {
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(ent.getWorld());
        if (ent instanceof Enderman) {
-            if (event.getTo() == Material.AIR) {
-                // pickup
+            if (wcfg.disableEndermanGriefing) {
+                event.setCancelled(true);
+                return;
+            }

-                if (wcfg.disableEndermanGriefing) {
+            if (wcfg.useRegions) {
+                if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
                    event.setCancelled(true);
                    return;
                }
-
-                if (wcfg.useRegions) {
-                    if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            } else {
-                // place
-
-                if (wcfg.disableEndermanGriefing) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
            }
-        } else if (ent.getType() == witherType) {
-
+        } else if (ent.getType() == EntityType.WITHER) {
            if (wcfg.blockWitherBlockDamage || wcfg.blockWitherExplosions) {
                event.setCancelled(true);
                return;
@@ -30,6 +30,7 @@ import org.bukkit.entity.Hanging;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -79,6 +80,10 @@ public class WorldGuardHangingListener implements Listener {
        if (event instanceof HangingBreakByEntityEvent) {
            HangingBreakByEntityEvent entityEvent = (HangingBreakByEntityEvent) event;
            Entity removerEntity = entityEvent.getRemover();
+            if (removerEntity instanceof Projectile) {
+                Projectile projectile = (Projectile) removerEntity; 
+                removerEntity = projectile.getShooter() != null ? projectile.getShooter() : removerEntity; 
+            }

            if (removerEntity instanceof Player) {
                Player player = (Player) removerEntity;
@@ -169,7 +174,7 @@ public class WorldGuardHangingListener implements Listener {
        }

        if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getLocation())) {
+            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;
@@ -45,6 +45,7 @@ import org.bukkit.event.player.PlayerBucketEmptyEvent;
 import org.bukkit.event.player.PlayerBucketFillEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerGameModeChangeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerItemHeldEvent;
@@ -107,6 +108,166 @@ public class WorldGuardPlayerListener implements Listener {
        }
    }

+    /**
+     * Handles movement related events, including changing gamemode, sending
+     * greeting/farewell messages, etc.
+     * A reference to WorldGuardPlugin is required to keep this method static
+     * although WGBukkit.getPlugin() may be used.
+     * @return true if the movement should not be allowed
+     */
+    public static boolean checkMove(WorldGuardPlugin plugin, Player player, World world, Location from, Location to) {
+        PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+
+        //Flush states in multiworld scenario
+        if (state.lastWorld != null && !state.lastWorld.equals(world)) {
+            plugin.getFlagStateManager().forget(player);
+            state = plugin.getFlagStateManager().getState(player);
+        }
+
+        LocalPlayer localPlayer = plugin.wrapPlayer(player);
+        boolean hasBypass = plugin.getGlobalRegionManager().hasBypass(player, world);
+
+        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+        Vector pt = new Vector(to.getBlockX(), to.getBlockY(), to.getBlockZ());
+        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+        /*
+        // check if region is full
+        // get the lowest number of allowed members in any region
+        boolean regionFull = false;
+        String maxPlayerMessage = null;
+        if (!hasBypass) {
+            for (ProtectedRegion region : set) {
+                if (region instanceof GlobalProtectedRegion) {
+                    continue; // global region can't have a max
+                }
+                // get the max for just this region
+                Integer maxPlayers = region.getFlag(DefaultFlag.MAX_PLAYERS);
+                if (maxPlayers == null) {
+                    continue;
+                }
+                int occupantCount = 0;
+                for(Player occupant : world.getPlayers()) {
+                    // each player in this region counts as one toward the max of just this region
+                    // A person with bypass doesn't count as an occupant of the region
+                    if (!occupant.equals(player) && !plugin.getGlobalRegionManager().hasBypass(occupant, world)) {
+                        if (region.contains(BukkitUtil.toVector(occupant.getLocation()))) {
+                            if (++occupantCount >= maxPlayers) {
+                                regionFull = true;
+                                maxPlayerMessage = region.getFlag(DefaultFlag.MAX_PLAYERS_MESSAGE);
+                                // At least one region in the set is full, we are going to use this message because it
+                                // was the first one we detected as full. In reality we should check them all and then
+                                // resolve the message from full regions, but that is probably a lot laggier (and this
+                                // is already pretty laggy. In practice, we can't really control which one we get first
+                                // right here.
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        */
+
+        boolean entryAllowed = set.allows(DefaultFlag.ENTRY, localPlayer);
+        if (!hasBypass && (!entryAllowed /*|| regionFull*/)) {
+            String message = /*maxPlayerMessage != null ? maxPlayerMessage :*/ "You are not permitted to enter this area.";
+
+            player.sendMessage(ChatColor.DARK_RED + message);
+            return true;
+        }
+
+        // Have to set this state
+        if (state.lastExitAllowed == null) {
+            state.lastExitAllowed = mgr.getApplicableRegions(toVector(from))
+                    .allows(DefaultFlag.EXIT, localPlayer);
+        }
+
+        boolean exitAllowed = set.allows(DefaultFlag.EXIT, localPlayer);
+        if (!hasBypass && exitAllowed && !state.lastExitAllowed) {
+            player.sendMessage(ChatColor.DARK_RED + "You are not permitted to leave this area.");
+            return true;
+        }
+
+//        WorldGuardRegionMoveEvent event = new WorldGuardRegionMoveEvent(plugin, player, state, set, from, to);
+//        Bukkit.getPluginManager().callEvent(event);
+
+        String greeting = set.getFlag(DefaultFlag.GREET_MESSAGE);//, localPlayer);
+        String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE);//, localPlayer);
+        Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER);//, localPlayer);
+        Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE);//, localPlayer);
+        GameMode gameMode = set.getFlag(DefaultFlag.GAME_MODE);
+
+        if (state.lastFarewell != null && (farewell == null
+                || !state.lastFarewell.equals(farewell))) {
+            String replacedFarewell = plugin.replaceMacros(
+                    player, BukkitUtil.replaceColorMacros(state.lastFarewell));
+            for (String line : replacedFarewell.split("\n")) {
+                player.sendMessage(line);
+            }
+        }
+
+        if (greeting != null && (state.lastGreeting == null
+                || !state.lastGreeting.equals(greeting))) {
+            String replacedGreeting = plugin.replaceMacros(
+                    player, BukkitUtil.replaceColorMacros(greeting));
+            for (String line : replacedGreeting.split("\n")) {
+                player.sendMessage(line);
+            }
+        }
+
+        if ((notifyLeave == null || !notifyLeave)
+                && state.notifiedForLeave != null && state.notifiedForLeave) {
+            plugin.broadcastNotification(ChatColor.GRAY + "WG: "
+                    + ChatColor.LIGHT_PURPLE + player.getName()
+                    + ChatColor.GOLD + " left NOTIFY region");
+        }
+
+        if (notifyEnter != null && notifyEnter && (state.notifiedForEnter == null
+                || !state.notifiedForEnter)) {
+            StringBuilder regionList = new StringBuilder();
+
+            for (ProtectedRegion region : set) {
+                if (regionList.length() != 0) {
+                    regionList.append(", ");
+                }
+                regionList.append(region.getId());
+            }
+
+            plugin.broadcastNotification(ChatColor.GRAY + "WG: "
+                    + ChatColor.LIGHT_PURPLE + player.getName()
+                    + ChatColor.GOLD + " entered NOTIFY region: "
+                    + ChatColor.WHITE
+                    + regionList);
+        }
+
+        if (!hasBypass && gameMode != null) {
+            if (player.getGameMode() != gameMode) {
+                state.lastGameMode = player.getGameMode();
+                player.setGameMode(gameMode);
+            } else if (state.lastGameMode == null) {
+                state.lastGameMode = player.getServer().getDefaultGameMode();
+            }
+        } else {
+            if (state.lastGameMode != null) {
+                GameMode mode = state.lastGameMode;
+                state.lastGameMode = null;
+                player.setGameMode(mode);
+            }
+        }
+
+        state.lastGreeting = greeting;
+        state.lastFarewell = farewell;
+        state.notifiedForEnter = notifyEnter;
+        state.notifiedForLeave = notifyLeave;
+        state.lastExitAllowed = exitAllowed;
+        state.lastWorld = to.getWorld();
+        state.lastBlockX = to.getBlockX();
+        state.lastBlockY = to.getBlockY();
+        state.lastBlockZ = to.getBlockZ();
+        return false;
+    }
+
    class PlayerMoveHandler implements Listener {
        @EventHandler(priority = EventPriority.HIGH)
        public void onPlayerMove(PlayerMoveEvent event) {
@@ -124,164 +285,14 @@ public class WorldGuardPlayerListener implements Listener {
                if (event.getFrom().getBlockX() != event.getTo().getBlockX()
                        || event.getFrom().getBlockY() != event.getTo().getBlockY()
                        || event.getFrom().getBlockZ() != event.getTo().getBlockZ()) {
-                    PlayerFlagState state = plugin.getFlagStateManager().getState(player);
-
-                    //Flush states in multiworld scenario
-                    if (state.lastWorld != null && !state.lastWorld.equals(world)) {
-                        plugin.getFlagStateManager().forget(player);
-                        state = plugin.getFlagStateManager().getState(player);
-                    }
-
-                    LocalPlayer localPlayer = plugin.wrapPlayer(player);
-                    boolean hasBypass = plugin.getGlobalRegionManager().hasBypass(player, world);
-
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-                    Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
-                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-                    /*
-                    // check if region is full
-                    // get the lowest number of allowed members in any region
-                    boolean regionFull = false;
-                    String maxPlayerMessage = null;
-                    if (!hasBypass) {
-                        for (ProtectedRegion region : set) {
-                            if (region instanceof GlobalProtectedRegion) {
-                                continue; // global region can't have a max
-                            }
-                            // get the max for just this region
-                            Integer maxPlayers = region.getFlag(DefaultFlag.MAX_PLAYERS);
-                            if (maxPlayers == null) {
-                                continue;
-                            }
-                            int occupantCount = 0;
-                            for(Player occupant : world.getPlayers()) {
-                                // each player in this region counts as one toward the max of just this region
-                                // A person with bypass doesn't count as an occupant of the region
-                                if (!occupant.equals(player) && !plugin.getGlobalRegionManager().hasBypass(occupant, world)) {
-                                    if (region.contains(BukkitUtil.toVector(occupant.getLocation()))) {
-                                        if (++occupantCount >= maxPlayers) {
-                                            regionFull = true;
-                                            maxPlayerMessage = region.getFlag(DefaultFlag.MAX_PLAYERS_MESSAGE);
-                                            // At least one region in the set is full, we are going to use this message because it
-                                            // was the first one we detected as full. In reality we should check them all and then
-                                            // resolve the message from full regions, but that is probably a lot laggier (and this
-                                            // is already pretty laggy. In practice, we can't really control which one we get first
-                                            // right here.
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    */
-
-                    boolean entryAllowed = set.allows(DefaultFlag.ENTRY, localPlayer);
-                    if (!hasBypass && (!entryAllowed /*|| regionFull*/)) {
-                        String message = /*maxPlayerMessage != null ? maxPlayerMessage :*/ "You are not permitted to enter this area.";
-
-                        player.sendMessage(ChatColor.DARK_RED + message);
-
+                    boolean result = checkMove(plugin, player, world, event.getFrom(), event.getTo());
+                    if (result) {
                        Location newLoc = event.getFrom();
                        newLoc.setX(newLoc.getBlockX() + 0.5);
                        newLoc.setY(newLoc.getBlockY());
                        newLoc.setZ(newLoc.getBlockZ() + 0.5);
                        event.setTo(newLoc);
-                        return;
                    }
-
-                    // Have to set this state
-                    if (state.lastExitAllowed == null) {
-                        state.lastExitAllowed = mgr.getApplicableRegions(toVector(event.getFrom()))
-                                .allows(DefaultFlag.EXIT, localPlayer);
-                    }
-
-                    boolean exitAllowed = set.allows(DefaultFlag.EXIT, localPlayer);
-                    if (!hasBypass && exitAllowed && !state.lastExitAllowed) {
-                        player.sendMessage(ChatColor.DARK_RED + "You are not permitted to leave this area.");
-
-                        Location newLoc = event.getFrom();
-                        newLoc.setX(newLoc.getBlockX() + 0.5);
-                        newLoc.setY(newLoc.getBlockY());
-                        newLoc.setZ(newLoc.getBlockZ() + 0.5);
-                        event.setTo(newLoc);
-                        return;
-                    }
-
-                    String greeting = set.getFlag(DefaultFlag.GREET_MESSAGE);//, localPlayer);
-                    String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE);//, localPlayer);
-                    Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER);//, localPlayer);
-                    Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE);//, localPlayer);
-                    GameMode gameMode = set.getFlag(DefaultFlag.GAME_MODE);
-
-                    if (state.lastFarewell != null && (farewell == null
-                            || !state.lastFarewell.equals(farewell))) {
-                        String replacedFarewell = plugin.replaceMacros(
-                                player, BukkitUtil.replaceColorMacros(state.lastFarewell));
-                        for (String line : replacedFarewell.split("\n")) {
-                            player.sendMessage(ChatColor.AQUA + " ** " + line);
-                        }
-                    }
-
-                    if (greeting != null && (state.lastGreeting == null
-                            || !state.lastGreeting.equals(greeting))) {
-                        String replacedGreeting = plugin.replaceMacros(
-                                player, BukkitUtil.replaceColorMacros(greeting));
-                        for (String line : replacedGreeting.split("\n")) {
-                            player.sendMessage(ChatColor.AQUA + " ** " + line);
-                        }
-                    }
-
-                    if ((notifyLeave == null || !notifyLeave)
-                            && state.notifiedForLeave != null && state.notifiedForLeave) {
-                        plugin.broadcastNotification(ChatColor.GRAY + "WG: "
-                                + ChatColor.LIGHT_PURPLE + player.getName()
-                                + ChatColor.GOLD + " left NOTIFY region");
-                    }
-
-                    if (notifyEnter != null && notifyEnter && (state.notifiedForEnter == null
-                            || !state.notifiedForEnter)) {
-                        StringBuilder regionList = new StringBuilder();
-
-                        for (ProtectedRegion region : set) {
-                            if (regionList.length() != 0) {
-                                regionList.append(", ");
-                            }
-                            regionList.append(region.getId());
-                        }
-
-                        plugin.broadcastNotification(ChatColor.GRAY + "WG: "
-                                + ChatColor.LIGHT_PURPLE + player.getName()
-                                + ChatColor.GOLD + " entered NOTIFY region: "
-                                + ChatColor.WHITE
-                                + regionList);
-                    }
-
-                    if (!hasBypass && gameMode != null) {
-                        if (player.getGameMode() != gameMode) {
-                            state.lastGameMode = player.getGameMode();
-                            player.setGameMode(gameMode);
-                        } else if (state.lastGameMode == null) {
-                            state.lastGameMode = player.getServer().getDefaultGameMode();
-                        }
-                    } else {
-                        if (state.lastGameMode != null) {
-                            GameMode mode = state.lastGameMode;
-                            state.lastGameMode = null;
-                            player.setGameMode(mode);
-                        }
-                    }
-
-                    state.lastGreeting = greeting;
-                    state.lastFarewell = farewell;
-                    state.notifiedForEnter = notifyEnter;
-                    state.notifiedForLeave = notifyLeave;
-                    state.lastExitAllowed = exitAllowed;
-                    state.lastWorld = event.getTo().getWorld();
-                    state.lastBlockX = event.getTo().getBlockX();
-                    state.lastBlockY = event.getTo().getBlockY();
-                    state.lastBlockZ = event.getTo().getBlockZ();
                }
            }
        }
@@ -297,8 +308,6 @@ public class WorldGuardPlayerListener implements Listener {
            if (plugin.getFlagStateManager().getState(player).lastGameMode != null
                    && gameMode != null && event.getNewGameMode() != gameMode) {
                event.setCancelled(true);
-                player.sendMessage(ChatColor.RED + "Your game mode is locked to "
-                        + gameMode + "in this region!");
            }
        }
    }
@@ -570,7 +579,8 @@ public class WorldGuardPlayerListener implements Listener {

            if (block.getRelative(event.getBlockFace()).getTypeId() == BlockID.FIRE) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)) {
+                        && !mgr.getApplicableRegions(block.getRelative(event.getBlockFace())
+                                .getLocation()).canBuild(localPlayer)) {
                    event.setUseInteractedBlock(Result.DENY);
                    event.setCancelled(true);
                    return;
@@ -600,10 +610,6 @@ public class WorldGuardPlayerListener implements Listener {
     * @param event Thrown event
     */
    private void handleAirRightClick(PlayerInteractEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
        Player player = event.getPlayer();
        World world = player.getWorld();
        ItemStack item = player.getItemInHand();
@@ -664,7 +670,9 @@ public class WorldGuardPlayerListener implements Listener {
        if (wcfg.useRegions) {
            Vector pt = toVector(block);
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            Block placedIn = block.getRelative(event.getBlockFace());
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            ApplicableRegionSet placedInSet = mgr.getApplicableRegions(placedIn.getLocation());
            LocalPlayer localPlayer = plugin.wrapPlayer(player);

            if (item.getTypeId() == wcfg.regionWand && plugin.hasPermission(player, "worldguard.region.wand")) {
@@ -690,19 +698,120 @@ public class WorldGuardPlayerListener implements Listener {
            }

            if (item.getTypeId() == BlockID.TNT) {
-                Block placedOn = block.getRelative(event.getBlockFace());
+                // workaround for a bug that allowed tnt to trigger instantly if placed
+                // next to redstone, without plugins getting the block place event
+                // (not sure if this actually still happens)
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !plugin.getGlobalRegionManager().allows(
-                        DefaultFlag.TNT, placedOn.getLocation(), localPlayer)) {
+                        && !placedInSet.allows(DefaultFlag.TNT, localPlayer)) {
                    event.setUseItemInHand(Result.DENY);
                    event.setCancelled(true);
                }
            }

+            // hacky workaround for craftbukkit bug
+            // has since been fixed, but leaving for legacy
+            if (item.getTypeId() == BlockID.STEP
+                    || item.getTypeId() == BlockID.WOODEN_STEP) {
+                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)) {
+                    boolean cancel = false;
+                    if ((block.getTypeId() == item.getTypeId()) 
+                        && !set.canBuild(localPlayer)) {
+                    // if we are on a step already, the new block will end up in the same block as the interact
+                        cancel = true;
+                    } else if (!placedInSet.canBuild(localPlayer)) {
+                    // if we are on another block, the half-slab in hand will be pushed to the adjacent block
+                        cancel = true;
+                    }
+                    if (cancel) {
+                        player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+
+            if (item.getTypeId() == ItemID.BED_ITEM) {
+                // this is mojang-level code, it had better give us the right direction
+                double yaw = (player.getLocation().getYaw() * 4.0F / 360.0F) + 0.5D;
+                int i = (int) yaw;
+                int i1 = (yaw < i ? i - 1 : i) & 3;
+                byte b0 = 0;
+                byte b1 = 0;
+                if (i1 == 0) {
+                    b1 = 1;
+                }
+                if (i1 == 1) {
+                    b0 = -1;
+                }
+                if (i1 == 2) {
+                    b1 = -1;
+                }
+                if (i1 == 3) {
+                    b0 = 1;
+                }
+                // end mojang-level code
+                Location headLoc = placedIn.getRelative(b0, 0, b1).getLocation();
+                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world) 
+                        && !mgr.getApplicableRegions(headLoc).canBuild(localPlayer)) {
+                    // note that normal block placement is handled later, this is just a workaround
+                    // for the location of the head block of the bed
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (block.getTypeId() == BlockID.PISTON_MOVING_PIECE) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.canBuild(localPlayer)) {
+                    event.setUseInteractedBlock(Result.DENY);
+                }
+            }
+
+            if (item.getTypeId() == ItemID.WOODEN_DOOR_ITEM || item.getTypeId() == ItemID.IRON_DOOR_ITEM) {
+                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)
+                        && !placedInSet.canBuild(localPlayer)) {
+                    // note that normal block placement is handled later, this is just a workaround
+                    // for the location of the top block of the door
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (item.getTypeId() == ItemID.FIRE_CHARGE || item.getTypeId() == ItemID.FLINT_AND_TINDER) {
+                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)
+                        && !placedInSet.allows(DefaultFlag.LIGHTER, localPlayer)) {
+                    event.setCancelled(true);
+                    event.setUseItemInHand(Result.DENY);
+                    player.sendMessage(ChatColor.DARK_RED + "You're not allowed to use that here.");
+                    return;
+                }
+            }
+
+            if (item.getTypeId() == ItemID.EYE_OF_ENDER && block.getTypeId() == BlockID.END_PORTAL_FRAME) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.canBuild(localPlayer)) {
+                    event.setCancelled(true);
+                    event.setUseItemInHand(Result.DENY);
+                    player.sendMessage(ChatColor.DARK_RED + "You're not allowed to use that here.");
+                    return;
+                }
+            }
+
            if (item.getTypeId() == ItemID.INK_SACK
                    && item.getData() != null) {
                if (item.getData().getData() == 15 // bonemeal
-                        && type == BlockID.GRASS) {
+                        && (type == BlockID.GRASS
+                        || type == BlockID.SAPLING
+                        || type == BlockID.CROPS
+                        || type == BlockID.BROWN_MUSHROOM
+                        || type == BlockID.RED_MUSHROOM
+                        || type == BlockID.PUMPKIN_STEM
+                        || type == BlockID.MELON_STEM
+                        || type == BlockID.POTATOES
+                        || type == BlockID.CARROTS
+                        || type == BlockID.COCOA_PLANT)) {
                    if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                            && !set.canBuild(localPlayer)) {
                        event.setCancelled(true);
@@ -733,10 +842,13 @@ public class WorldGuardPlayerListener implements Listener {
                        || item.getTypeId() == BlockID.CACTUS
                        || item.getTypeId() == BlockID.LONG_GRASS
                        || item.getTypeId() == BlockID.DEAD_BUSH) {
-                    event.setUseItemInHand(Result.DENY);
-                    event.setCancelled(true);
-                    player.sendMessage(ChatColor.DARK_RED + "You're not allowed to plant that here.");
-                    return;
+                    if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                            && !set.canBuild(localPlayer)) {
+                        event.setUseItemInHand(Result.DENY);
+                        event.setCancelled(true);
+                        player.sendMessage(ChatColor.DARK_RED + "You're not allowed to plant that here.");
+                        return;
+                    }
                }
            }

@@ -756,7 +868,9 @@ public class WorldGuardPlayerListener implements Listener {
                    || type == BlockID.FURNACE
                    || type == BlockID.BURNING_FURNACE
                    || type == BlockID.BREWING_STAND
-                    || type == BlockID.ENDER_CHEST) { // meh?
+                    || type == BlockID.TRAPPED_CHEST
+                    || type == BlockID.HOPPER
+                    || type == BlockID.DROPPER) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.canBuild(localPlayer)
                        && !set.allows(DefaultFlag.CHEST_ACCESS, localPlayer)) {
@@ -794,8 +908,11 @@ public class WorldGuardPlayerListener implements Listener {
                    || type == BlockID.BREWING_STAND
                    || type == BlockID.ENCHANTMENT_TABLE
                    || type == BlockID.CAULDRON
+                    || type == BlockID.ENDER_CHEST // blah
                    || type == BlockID.BEACON
-                    || type == BlockID.ANVIL) {
+                    || type == BlockID.ANVIL
+                    || type == BlockID.HOPPER
+                    || type == BlockID.DROPPER) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.canBuild(localPlayer)
                        && !set.allows(DefaultFlag.USE, localPlayer)) {
@@ -806,6 +923,20 @@ public class WorldGuardPlayerListener implements Listener {
                }
            }

+            if (type == BlockID.REDSTONE_REPEATER_OFF
+                    || type == BlockID.REDSTONE_REPEATER_ON
+                    || type == BlockID.COMPARATOR_OFF
+                    || type == BlockID.COMPARATOR_ON) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.canBuild(localPlayer)) {
+                    // using build and not use because it can potentially damage a circuit and use is more general-purposed
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
+                    event.setUseInteractedBlock(Result.DENY);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
            if (type == BlockID.CAKE_BLOCK) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.canBuild(localPlayer)
@@ -817,10 +948,15 @@ public class WorldGuardPlayerListener implements Listener {
                }
            }

-            if (BlockType.isRailBlock(type) && item.getTypeId() == ItemID.MINECART) {
+            if (BlockType.isRailBlock(type)
+                    && (item.getTypeId() == ItemID.MINECART
+                    || item.getTypeId() == ItemID.POWERED_MINECART
+                    || item.getTypeId() == ItemID.STORAGE_MINECART
+                    || item.getTypeId() == ItemID.TNT_MINECART
+                    || item.getTypeId() == ItemID.HOPPER_MINECART)) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)
-                        && !set.allows(DefaultFlag.PLACE_VEHICLE, localPlayer)) {
+                        && !placedInSet.canBuild(localPlayer)
+                        && !placedInSet.allows(DefaultFlag.PLACE_VEHICLE, localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
                    event.setUseItemInHand(Result.DENY);
                    event.setCancelled(true);
@@ -830,8 +966,8 @@ public class WorldGuardPlayerListener implements Listener {

            if (item.getTypeId() == ItemID.WOOD_BOAT) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)
-                        && !set.allows(DefaultFlag.PLACE_VEHICLE, localPlayer)) {
+                        && !placedInSet.canBuild(localPlayer)
+                        && !placedInSet.allows(DefaultFlag.PLACE_VEHICLE, localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
                    event.setUseItemInHand(Result.DENY);
                    event.setCancelled(true);
@@ -841,13 +977,18 @@ public class WorldGuardPlayerListener implements Listener {
        }

        if (wcfg.getBlacklist() != null) {
-            if (player.isSneaking() // sneak + right clicking no longer activates blocks as of some recent version
+            if (player.isSneaking() // sneak + right clicking no longer opens guis as of some recent version
                    || (type != BlockID.CHEST
                    && type != BlockID.DISPENSER
                    && type != BlockID.FURNACE
                    && type != BlockID.BURNING_FURNACE
                    && type != BlockID.BREWING_STAND
-                    && type != BlockID.ENCHANTMENT_TABLE)) {
+                    && type != BlockID.ENCHANTMENT_TABLE
+                    && type != BlockID.ANVIL
+                    && type != BlockID.ENDER_CHEST
+                    && type != BlockID.TRAPPED_CHEST
+                    && type != BlockID.HOPPER
+                    && type != BlockID.DROPPER)) {
                if (!wcfg.getBlacklist().check(
                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
                                item.getTypeId()), false, false)) {
@@ -883,7 +1024,10 @@ public class WorldGuardPlayerListener implements Listener {
                || type == BlockID.FURNACE
                || type == BlockID.BURNING_FURNACE
                || type == BlockID.ENCHANTMENT_TABLE
-                || type == BlockID.BREWING_STAND)) {
+                || type == BlockID.BREWING_STAND
+                || type == BlockID.TRAPPED_CHEST
+                || type == BlockID.HOPPER
+                || type == BlockID.DROPPER)) {

            if (wcfg.isChestProtected(block, player)) {
                player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
@@ -971,7 +1115,8 @@ public class WorldGuardPlayerListener implements Listener {
            LocalPlayer localPlayer = plugin.wrapPlayer(player);

            if (type == BlockID.STONE_PRESSURE_PLATE || type == BlockID.WOODEN_PRESSURE_PLATE
-                    || type == BlockID.TRIPWIRE) {
+                    || type == BlockID.TRIPWIRE || type == BlockID.PRESSURE_PLATE_LIGHT
+                    || type == BlockID.PRESSURE_PLATE_HEAVY) {
               if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                       && !set.canBuild(localPlayer)
                       && !set.allows(DefaultFlag.USE, localPlayer)) {
@@ -1102,7 +1247,8 @@ public class WorldGuardPlayerListener implements Listener {
        WorldConfiguration wcfg = cfg.get(world);

        if (!plugin.getGlobalRegionManager().canBuild(
-                player, event.getBlockClicked().getRelative(event.getBlockFace()))) {
+                player, event.getBlockClicked().getRelative(event.getBlockFace()))
+                && !(event.getBucket().getId() == ItemID.MILK_BUCKET)) {
            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
            event.setCancelled(true);
            return;
@@ -1118,6 +1264,16 @@ public class WorldGuardPlayerListener implements Listener {
        }
    }

+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPlayerFish(PlayerFishEvent event) {
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getPlayer().getWorld());
+
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getPlayer().getLocation())) {
+            event.setExpToDrop(0);
+        }
+    }
+
    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
        Player player = event.getPlayer();
@@ -1212,21 +1368,20 @@ public class WorldGuardPlayerListener implements Listener {
        WorldConfiguration wcfg = cfg.get(world);

        if (wcfg.useRegions) {
-            if (event.getCause() == TeleportCause.ENDER_PEARL) {
-                RegionManager mgr = plugin.getGlobalRegionManager().get(event.getFrom().getWorld());
-                Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
-                Vector ptFrom = new Vector(event.getFrom().getBlockX(), event.getFrom().getBlockY(), event.getFrom().getBlockZ());
-                ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-                ApplicableRegionSet setFrom = mgr.getApplicableRegions(ptFrom);
-                LocalPlayer localPlayer = plugin.wrapPlayer(event.getPlayer());
+            RegionManager mgr = plugin.getGlobalRegionManager().get(event.getFrom().getWorld());
+            Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
+            Vector ptFrom = new Vector(event.getFrom().getBlockX(), event.getFrom().getBlockY(), event.getFrom().getBlockZ());
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            ApplicableRegionSet setFrom = mgr.getApplicableRegions(ptFrom);
+            LocalPlayer localPlayer = plugin.wrapPlayer(event.getPlayer());

-                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)
-                        && !(set.allows(DefaultFlag.ENTRY, localPlayer)
-                                && setFrom.allows(DefaultFlag.EXIT, localPlayer))) {
-                    event.getPlayer().sendMessage(ChatColor.DARK_RED + "You're not allowed to go there.");
-                    event.setCancelled(true);
-                    return;
-                }
+            boolean result = checkMove(plugin, event.getPlayer(), event.getPlayer().getWorld(), event.getFrom(), event.getTo());
+            if (result) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (event.getCause() == TeleportCause.ENDER_PEARL) {
                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)
                        && !(set.allows(DefaultFlag.ENDERPEARL, localPlayer)
                                && setFrom.allows(DefaultFlag.ENDERPEARL, localPlayer))) {
@@ -1251,32 +1406,88 @@ public class WorldGuardPlayerListener implements Listener {
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);

-            String lowerCommand = event.getMessage().toLowerCase();
+            String usedCommand = event.getMessage().toLowerCase();

            Set<String> allowedCommands = set.getFlag(DefaultFlag.ALLOWED_CMDS, localPlayer);
            Set<String> blockedCommands = set.getFlag(DefaultFlag.BLOCKED_CMDS, localPlayer);

-            String blockedCommand = "";
-            if (blockedCommands != null){
-                for (String aCommand : blockedCommands) {
-                    if (lowerCommand.startsWith(aCommand)) {
-                        blockedCommand = aCommand;
-                        break;
-                    }
-                }
-            }
-            if (allowedCommands != null) {
-                if (blockedCommand.isEmpty()) blockedCommand = lowerCommand.split(" ")[0];
-                for (String aCommand : allowedCommands) {
-                    if (lowerCommand.startsWith(aCommand)) {
-                        blockedCommand = "";
-                        break;
+            /*
+             * blocked      used        allow?
+             * x            x           no
+             * x            x y         no
+             * x y          x           yes
+             * x y          x y         no
+             * 
+             * allowed      used        allow?
+             * x            x           yes
+             * x            x y         yes
+             * x y          x           no
+             * x y          x y         yes
+             */
+            String result = "";
+            String[] usedParts = usedCommand.split(" ");
+            if (blockedCommands != null) {
+                blocked:
+                for (String blockedCommand : blockedCommands) {
+                    String[] blockedParts = blockedCommand.split(" ");
+                    for (int i = 0; i < blockedParts.length && i < usedParts.length; i++) {
+                        if (blockedParts[i].equalsIgnoreCase(usedParts[i])) {
+                            // first part matches - check if it's the whole thing
+                            if (i + 1 == blockedParts.length) {
+                                // consumed all blocked parts, block entire command
+                                result = blockedCommand;
+                                break blocked;
+                            } else {
+                                // more blocked parts to check, also check used length
+                                if (i + 1 == usedParts.length) {
+                                    // all that was used, but there is more in blocked
+                                    // allow this, check next command in flag
+                                    continue blocked;
+                                } else {
+                                    // more in both blocked and used, continue checking
+                                    continue;
+                                }
+                            }
+                        }
                    }
                }
            }

-            if (!blockedCommand.isEmpty()) {
-                player.sendMessage(ChatColor.RED + blockedCommand + " is not allowed in this area.");
+            if (allowedCommands != null) {
+                allowed:
+                for (String allowedCommand : allowedCommands) {
+                    String[] allowedParts = allowedCommand.split(" ");
+                    for (int i = 0; i < allowedParts.length && i < usedParts.length; i++) {
+                        if (allowedParts[i].equalsIgnoreCase(usedParts[i])) {
+                            // this part matches - check if it's the whole thing
+                            if (i + 1 == allowedParts.length) {
+                                // consumed all allowed parts before reaching used length
+                                // this command is definitely allowed
+                                result = "";
+                                break allowed;
+                            } else {
+                                // more allowed parts to check
+                                if (i + 1 == usedParts.length) {
+                                    // all that was used, but there is more in allowed
+                                    // block for now, check next part of flag
+                                    result = usedCommand;
+                                    continue allowed;
+                                } else {
+                                    // more in both allowed and used, continue checking for match
+                                    continue;
+                                }
+                            }
+                        } else {
+                            // doesn't match at all, block it, check next flag string
+                            result = usedCommand;
+                            continue allowed;
+                        }
+                    }
+                }
+            }
+
+            if (!result.isEmpty()) {
+                player.sendMessage(ChatColor.RED + result + " is not allowed in this area.");
                event.setCancelled(true);
                return;
            }
@@ -34,9 +34,6 @@ import java.util.Set;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;

-import com.sk89q.bukkit.util.CommandsManagerRegistration;
-import com.sk89q.minecraft.util.commands.*;
-import com.sk89q.wepif.PermissionsResolverManager;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -50,6 +47,15 @@ import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;

+import com.sk89q.bukkit.util.CommandsManagerRegistration;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissionsException;
+import com.sk89q.minecraft.util.commands.CommandUsageException;
+import com.sk89q.minecraft.util.commands.CommandsManager;
+import com.sk89q.minecraft.util.commands.MissingNestedCommandException;
+import com.sk89q.minecraft.util.commands.SimpleInjector;
+import com.sk89q.minecraft.util.commands.WrappedCommandException;
+import com.sk89q.wepif.PermissionsResolverManager;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.bukkit.commands.GeneralCommands;
@@ -138,12 +144,12 @@ public class WorldGuardPlugin extends JavaPlugin {
        LegacyWorldGuardMigration.migrateBlacklist(this);

        try {
-        	// Load the configuration
-        	configuration.load();
-        	globalRegionManager.preload();
+            // Load the configuration
+            configuration.load();
+            globalRegionManager.preload();
        } catch (FatalConfigurationLoadingException e) {
-        	e.printStackTrace();
-        	getServer().shutdown();
+            e.printStackTrace();
+            getServer().shutdown();
        }

        // Migrate regions after the regions were loaded because
@@ -275,7 +275,9 @@ public class GeneralCommands {
                    if (item2.getTypeId() == item.getTypeId() &&
                            ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged)
                                    || item.getDurability() == item2.getDurability()) &&
-                            item.getEnchantments().equals(item2.getEnchantments())) {
+                                    ((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);
@@ -19,7 +19,23 @@

 package com.sk89q.worldguard.bukkit.commands;

-import com.sk89q.minecraft.util.commands.*;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.sk89q.minecraft.util.commands.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.minecraft.util.commands.CommandPermissionsException;
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Location;
 import com.sk89q.worldedit.Vector;
@@ -38,60 +54,57 @@ import com.sk89q.worldguard.protection.databases.RegionDBUtil;
 import com.sk89q.worldguard.protection.databases.migrators.AbstractDatabaseMigrator;
 import com.sk89q.worldguard.protection.databases.migrators.MigrationException;
 import com.sk89q.worldguard.protection.databases.migrators.MigratorKey;
-import com.sk89q.worldguard.protection.flags.*;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.RegionGroup;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 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;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;

 public class RegionCommands {
    private final WorldGuardPlugin plugin;

    private MigratorKey migrateDBRequest;
    private Date migrateDBRequestDate;
-    
+
    public RegionCommands(WorldGuardPlugin plugin) {
        this.plugin = plugin;
    }
-    
+
    @Command(aliases = {"define", "def", "d"}, usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
            desc = "Defines a region", min = 1)
    @CommandPermissions({"worldguard.region.define"})
    public void define(CommandContext args, CommandSender sender) throws CommandException {
-        
+
        Player player = plugin.checkPlayer(sender);
        WorldEditPlugin worldEdit = plugin.getWorldEdit();
        String id = args.getString(0);
-        
+
        if (!ProtectedRegion.isValidId(id)) {
            throw new CommandException("Invalid region ID specified!");
        }
-        
+
        if (id.equalsIgnoreCase("__global__")) {
            throw new CommandException("A region cannot be named __global__");
        }
-        
+
        // Attempt to get the player's selection from WorldEdit
        Selection sel = worldEdit.getSelection(player);
-        
+
        if (sel == null) {
            throw new CommandException("Select a region with WorldEdit first.");
        }
-        
+
        RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
        if (mgr.hasRegion(id)) {
            throw new CommandException("That region is already defined. Use redefine instead.");
        }
-        
+
        ProtectedRegion region;

        // Detect the type of region from WorldEdit
@@ -113,9 +126,9 @@ public class RegionCommands {
        if (args.argsLength() > 1) {
            region.setOwners(RegionDBUtil.parseDomainString(args.getSlice(1), 1));
        }
-        
+
        mgr.addRegion(region);
-        
+
        try {
            mgr.save();
            sender.sendMessage(ChatColor.YELLOW + "Region saved as " + id + ".");
@@ -124,17 +137,17 @@ public class RegionCommands {
                    + e.getMessage());
        }
    }
-    
+
    @Command(aliases = {"redefine", "update", "move"}, usage = "<id>",
            desc = "Re-defines the shape of a region", min = 1, max = 1)
    public void redefine(CommandContext args, CommandSender sender) throws CommandException {
-        
+
        Player player = plugin.checkPlayer(sender);
        World world = player.getWorld();
        WorldEditPlugin worldEdit = plugin.getWorldEdit();
        LocalPlayer localPlayer = plugin.wrapPlayer(player);
        String id = args.getString(0);
-        
+
        if (id.equalsIgnoreCase("__global__")) {
            throw new CommandException("The region cannot be named __global__");
        }
@@ -153,16 +166,16 @@ public class RegionCommands {
        } else {
            plugin.checkPermission(sender, "worldguard.region.redefine");
        } 
-        
+
        // Attempt to get the player's selection from WorldEdit
        Selection sel = worldEdit.getSelection(player);
-        
+
        if (sel == null) {
            throw new CommandException("Select a region with WorldEdit first.");
        }
-        
+
        ProtectedRegion region;
-        
+
        // Detect the type of region from WorldEdit
        if (sel instanceof Polygonal2DSelection) {
            Polygonal2DSelection polySel = (Polygonal2DSelection) sel;
@@ -186,11 +199,11 @@ public class RegionCommands {
            region.setParent(existing.getParent());
        } catch (CircularInheritanceException ignore) {
        }
-        
+
        mgr.addRegion(region);
-        
+
        sender.sendMessage(ChatColor.YELLOW + "Region updated with new area.");
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -198,38 +211,38 @@ public class RegionCommands {
                    + e.getMessage());
        }
    }
-    
+
    @Command(aliases = {"claim"}, usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
            desc = "Claim a region", min = 1)
    @CommandPermissions({"worldguard.region.claim"})
    public void claim(CommandContext args, CommandSender sender) throws CommandException {
-        
+
        Player player = plugin.checkPlayer(sender);
        LocalPlayer localPlayer = plugin.wrapPlayer(player);
        WorldEditPlugin worldEdit = plugin.getWorldEdit();
        String id = args.getString(0);
-        
+
        if (!ProtectedRegion.isValidId(id)) {
            throw new CommandException("Invalid region ID specified!");
        }
-        
+
        if (id.equalsIgnoreCase("__global__")) {
            throw new CommandException("A region cannot be named __global__");
        }
-        
+
        // Attempt to get the player's selection from WorldEdit
        Selection sel = worldEdit.getSelection(player);
-        
+
        if (sel == null) {
            throw new CommandException("Select a region with WorldEdit first.");
        }
-        
+
        RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());

        if (mgr.hasRegion(id)) {
            throw new CommandException("That region already exists. Please choose a different name.");
        }
-        
+
        ProtectedRegion region;

        // Detect the type of region from WorldEdit
@@ -253,7 +266,7 @@ public class RegionCommands {
        }

        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld());
-        
+
        if (!plugin.hasPermission(sender, "worldguard.region.unlimited")) {
            // Check whether the player has created too many regions 
            int maxRegionCount = wcfg.getMaxRegionCount(player);
@@ -271,9 +284,9 @@ public class RegionCommands {
                throw new CommandException("This region already exists and you don't own it.");
            }
        }
-        
+
        ApplicableRegionSet regions = mgr.getApplicableRegions(region);
-        
+
        // Check if this region overlaps any other region
        if (regions.size() > 0) {
            if (!regions.isOwnerOfAll(localPlayer)) {
@@ -320,7 +333,7 @@ public class RegionCommands {

        region.getOwners().addPlayer(player.getName());
        mgr.addRegion(region);
-        
+
        try {
            mgr.save();
            sender.sendMessage(ChatColor.YELLOW + "Region saved as " + id + ".");
@@ -389,7 +402,7 @@ public class RegionCommands {
                    world, poly2d.getPoints(),
                    poly2d.getMinimumPoint().getBlockY(),
                    poly2d.getMaximumPoint().getBlockY()
-            );
+                    );
            worldEdit.setSelection(player, selection);
            player.sendMessage(ChatColor.YELLOW + "Region selected as a polygon.");
        } else if (region instanceof GlobalProtectedRegion) {
@@ -524,7 +537,7 @@ public class RegionCommands {
        sender.sendMessage(ChatColor.LIGHT_PURPLE + "Bounds:"
                + " (" + min.getBlockX() + "," + min.getBlockY() + "," + min.getBlockZ() + ")"
                + " (" + max.getBlockX() + "," + max.getBlockY() + "," + max.getBlockZ() + ")"
-        );
+                );
    }

    public class RegionEntry implements Comparable<RegionEntry>{
@@ -649,14 +662,27 @@ public class RegionCommands {
        }
    }

-    @Command(aliases = {"flag", "f"}, usage = "<id> <flag> [-g group] [value]", flags = "g:",
+    @Command(aliases = {"flag", "f"}, usage = "<id> <flag> [-g group] [value]", flags = "g:w:",
            desc = "Set flags", min = 2)
    public void flag(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+
+        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);
        String flagName = args.getString(1);
        String value = null;
@@ -680,20 +706,24 @@ public class RegionCommands {

        // @TODO deprecate "flag.[own./member./blank]"
        boolean hasPerm = false;
-        if (region.isOwner(localPlayer)) {
-            if (plugin.hasPermission(sender, "worldguard.region.flag.own." + id.toLowerCase())) hasPerm = true;
-            else if (plugin.hasPermission(sender, "worldguard.region.flag.regions.own." + id.toLowerCase())) hasPerm = true;
-        } else if (region.isMember(localPlayer)) {
-            if (plugin.hasPermission(sender, "worldguard.region.flag.member." + id.toLowerCase())) hasPerm = true;
-            else if (plugin.hasPermission(sender, "worldguard.region.flag.regions.member." + id.toLowerCase())) hasPerm = true;
+        if (localPlayer == null) {
+            hasPerm = true;
        } else {
-            if (plugin.hasPermission(sender, "worldguard.region.flag." + id.toLowerCase())) hasPerm = true;
-            else if (plugin.hasPermission(sender, "worldguard.region.flag.regions." + id.toLowerCase())) hasPerm = true;
+            if (region.isOwner(localPlayer)) {
+                if (plugin.hasPermission(sender, "worldguard.region.flag.own." + id.toLowerCase())) hasPerm = true;
+                else if (plugin.hasPermission(sender, "worldguard.region.flag.regions.own." + id.toLowerCase())) hasPerm = true;
+            } else if (region.isMember(localPlayer)) {
+                if (plugin.hasPermission(sender, "worldguard.region.flag.member." + id.toLowerCase())) hasPerm = true;
+                else if (plugin.hasPermission(sender, "worldguard.region.flag.regions.member." + id.toLowerCase())) hasPerm = true;
+            } else {
+                if (plugin.hasPermission(sender, "worldguard.region.flag." + id.toLowerCase())) hasPerm = true;
+                else if (plugin.hasPermission(sender, "worldguard.region.flag.regions." + id.toLowerCase())) hasPerm = true;
+            }
        }
        if (!hasPerm) throw new CommandPermissionsException();
-        
+
        Flag<?> foundFlag = null;
-        
+
        // Now time to find the flag!
        for (Flag<?> flag : DefaultFlag.getFlags()) {
            // Try to detect the flag
@@ -702,30 +732,32 @@ public class RegionCommands {
                break;
            }
        }
-        
+
        if (foundFlag == null) {
            StringBuilder list = new StringBuilder();
-            
+
            // Need to build a list
            for (Flag<?> flag : DefaultFlag.getFlags()) {

                // @TODO deprecate inconsistant "owner" permission
-                if (region.isOwner(localPlayer)) {
-                    if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
-                            + flag.getName() + ".owner." + id.toLowerCase())
-                            && !plugin.hasPermission(sender, "worldguard.region.flag.flags."
-                                    + flag.getName() + ".own." + id.toLowerCase())) {
-                        continue;
-                    }
-                } else if (region.isMember(localPlayer)) {
-                    if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
-                            + flag.getName() + ".member." + id.toLowerCase())) {
-                        continue;
-                    }
-                } else {
-                    if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
+                if (localPlayer != null) {
+                    if (region.isOwner(localPlayer)) {
+                        if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
+                                + flag.getName() + ".owner." + id.toLowerCase())
+                                && !plugin.hasPermission(sender, "worldguard.region.flag.flags."
+                                        + flag.getName() + ".own." + id.toLowerCase())) {
+                            continue;
+                        }
+                    } else if (region.isMember(localPlayer)) {
+                        if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
+                                + flag.getName() + ".member." + id.toLowerCase())) {
+                            continue;
+                        }
+                    } else {
+                        if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
                                + flag.getName() + "." + id.toLowerCase())) {
-                        continue;
+                            continue;
+                        }
                    }
                }

@@ -735,20 +767,22 @@ public class RegionCommands {
                list.append(flag.getName());
            }

-            player.sendMessage(ChatColor.RED + "Unknown flag specified: " + flagName);
-            player.sendMessage(ChatColor.RED + "Available flags: " + list);
+            sender.sendMessage(ChatColor.RED + "Unknown flag specified: " + flagName);
+            sender.sendMessage(ChatColor.RED + "Available flags: " + list);
            return;
        }

-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.flag.flags."
-                    + foundFlag.getName() + ".owner." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.flag.flags."
-                    + foundFlag.getName() + ".member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.flag.flags."
-                    + foundFlag.getName() + "." + id.toLowerCase());
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.flag.flags."
+                        + foundFlag.getName() + ".owner." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.flag.flags."
+                        + foundFlag.getName() + ".member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.flag.flags."
+                        + foundFlag.getName() + "." + id.toLowerCase());
+            }
        }

        if (args.hasFlag('g')) {
@@ -817,27 +851,43 @@ public class RegionCommands {
                    + e.getMessage());
        }
    }
-    
+
    public <V> void setFlag(ProtectedRegion region,
            Flag<V> flag, CommandSender sender, String value)
-                throws InvalidFlagFormat {
+                    throws InvalidFlagFormat {
        region.setFlag(flag, flag.parseInput(plugin, sender, value));
    }
-    
-    @Command(aliases = {"setpriority", "priority", "pri"}, usage = "<id> <priority>",
-            desc = "Set the priority of a region", min = 2, max = 2)
+
+    @Command(aliases = {"setpriority", "priority", "pri"},
+            usage = "<id> <priority>",
+            flags = "w:",
+            desc = "Set the priority of a region",
+            min = 2, max = 2)
    public void setPriority(CommandContext args, CommandSender sender) throws CommandException {
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        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);
        int priority = args.getInteger(1);
-        
+
        if (id.equalsIgnoreCase("__global__")) {
            throw new CommandException("The region cannot be named __global__");
        }
-        
+
        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
        ProtectedRegion region = mgr.getRegion(id);
        if (region == null) {
@@ -846,20 +896,22 @@ public class RegionCommands {

        id = region.getId();

-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.setpriority.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.setpriority.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.setpriority." + id.toLowerCase());
-        } 
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.setpriority.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.setpriority.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.setpriority." + id.toLowerCase());
+            }
+        }

        region.setPriority(priority);

        sender.sendMessage(ChatColor.YELLOW
                + "Priority of '" + region.getId() + "' set to "
                + priority + ".");
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -867,20 +919,36 @@ public class RegionCommands {
                    + e.getMessage());
        }
    }
-    
-    @Command(aliases = {"setparent", "parent", "par"}, usage = "<id> [parent-id]",
-            desc = "Set the parent of a region", min = 1, max = 2)
+
+    @Command(aliases = {"setparent", "parent", "par"}, 
+            usage = "<id> [parent-id]",
+            flags = "w:",
+            desc = "Set the parent of a region",
+            min = 1, max = 2)
    public void setParent(CommandContext args, CommandSender sender) throws CommandException {
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        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);
-        
+
        if (id.equalsIgnoreCase("__global__")) {
            throw new CommandException("The region cannot be named __global__");
        }
-        
+
        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
        ProtectedRegion region = mgr.getRegion(id);
        if (region == null) {
@@ -894,44 +962,45 @@ public class RegionCommands {
                region.setParent(null);
            } catch (CircularInheritanceException ignore) {
            }
-    
+
            sender.sendMessage(ChatColor.YELLOW
                    + "Parent of '" + region.getId() + "' cleared.");
        } else {
            String parentId = args.getString(1);
            ProtectedRegion parent = mgr.getRegion(parentId);
-    
+
            if (parent == null) {
                throw new CommandException("Could not find the parent region by that ID.");
            }
-            
-            if (region.isOwner(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.setparent.own." + id.toLowerCase());
-            } else if (region.isMember(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.setparent.member." + id.toLowerCase());
-            } else {
-                plugin.checkPermission(sender, "worldguard.region.setparent." + id.toLowerCase());
-            } 
-            
-            if (parent.isOwner(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.setparent.own." + parentId.toLowerCase());
-            } else if (parent.isMember(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.setparent.member." + parentId.toLowerCase());
-            } else {
-                plugin.checkPermission(sender, "worldguard.region.setparent." + parentId.toLowerCase());
+
+            if (localPlayer != null) {
+                if (region.isOwner(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.setparent.own." + id.toLowerCase());
+                } else if (region.isMember(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.setparent.member." + id.toLowerCase());
+                } else {
+                    plugin.checkPermission(sender, "worldguard.region.setparent." + id.toLowerCase());
+                } 
+
+                if (parent.isOwner(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.setparent.own." + parentId.toLowerCase());
+                } else if (parent.isMember(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.setparent.member." + parentId.toLowerCase());
+                } else {
+                    plugin.checkPermission(sender, "worldguard.region.setparent." + parentId.toLowerCase());
+                }
            }
-            
            try {
                region.setParent(parent);
            } catch (CircularInheritanceException e) {
                throw new CommandException("Circular inheritance detected!");
            }
-    
+
            sender.sendMessage(ChatColor.YELLOW
                    + "Parent of '" + region.getId() + "' set to '"
                    + parent.getId() + "'.");
        }
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -939,15 +1008,30 @@ public class RegionCommands {
                    + e.getMessage());
        }
    }
-    
-    @Command(aliases = {"remove", "delete", "del", "rem"}, usage = "<id>",
-            desc = "Remove a region", min = 1, max = 1)
+
+    @Command(aliases = {"remove", "delete", "del", "rem"},
+            usage = "<id>",
+            flags = "w:",
+            desc = "Remove a region",
+            min = 1, max = 1)
    public void remove(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        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);
@@ -956,20 +1040,22 @@ public class RegionCommands {
        if (region == null) {
            throw new CommandException("Could not find a region by that ID.");
        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.remove.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.remove.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.remove." + id.toLowerCase());
+
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.remove.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.remove.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.remove." + id.toLowerCase());
+            }
        }
-        
+
        mgr.removeRegion(id);
-        
+
        sender.sendMessage(ChatColor.YELLOW
                + "Region '" + id + "' removed.");
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -977,21 +1063,21 @@ public class RegionCommands {
                    + e.getMessage());
        }
    }
-    
+
    @Command(aliases = {"load", "reload"}, usage = "[world]",
            desc = "Reload regions from file", max = 1)
    @CommandPermissions({"worldguard.region.load"})
    public void load(CommandContext args, CommandSender sender) throws CommandException {
-        
+
        World world = null;
-        
+
        if (args.argsLength() > 0) {
            world = plugin.matchWorld(sender, args.getString(0));
        }

        if (world != null) {
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            
+
            try {
                mgr.load();
                sender.sendMessage(ChatColor.YELLOW
@@ -1003,7 +1089,7 @@ public class RegionCommands {
        } else {
            for (World w : plugin.getServer().getWorlds()) {
                RegionManager mgr = plugin.getGlobalRegionManager().get(w);
-                
+
                try {
                    mgr.load();
                } catch (ProtectionDatabaseException e) {
@@ -1011,26 +1097,26 @@ public class RegionCommands {
                            + e.getMessage());
                }
            }
-            
+
            sender.sendMessage(ChatColor.YELLOW
                    + "Region databases loaded.");
        }
    }
-    
+
    @Command(aliases = {"save", "write"}, usage = "[world]",
            desc = "Re-save regions to file", max = 1)
    @CommandPermissions({"worldguard.region.save"})
    public void save(CommandContext args, CommandSender sender) throws CommandException {
-        
+
        World world = null;
-        
+
        if (args.argsLength() > 0) {
            world = plugin.matchWorld(sender, args.getString(0));
        }

        if (world != null) {
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            
+
            try {
                mgr.save();
                sender.sendMessage(ChatColor.YELLOW
@@ -1042,7 +1128,7 @@ public class RegionCommands {
        } else {
            for (World w : plugin.getServer().getWorlds()) {
                RegionManager mgr = plugin.getGlobalRegionManager().get(w);
-                
+
                try {
                    mgr.save();
                } catch (ProtectionDatabaseException e) {
@@ -1050,7 +1136,7 @@ public class RegionCommands {
                            + e.getMessage());
                }
            }
-            
+
            sender.sendMessage(ChatColor.YELLOW
                    + "Region databases saved.");
        }
@@ -1108,7 +1194,6 @@ public class RegionCommands {

    @Command(aliases = {"teleport", "tp"}, usage = "<id>", flags = "s",
            desc = "Teleports you to the location associated with the region.", min = 1, max = 1)
-    @CommandPermissions({"worldguard.region.teleport"})
    public void teleport(CommandContext args, CommandSender sender) throws CommandException {
        final Player player = plugin.checkPlayer(sender);

@@ -30,11 +30,11 @@ 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;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
-import com.sk89q.worldguard.protection.databases.RegionDBUtil;

 // @TODO: A lot of code duplication here! Need to fix.

@@ -44,15 +44,30 @@ public class RegionMemberCommands {
    public RegionMemberCommands(WorldGuardPlugin plugin) {
        this.plugin = plugin;
    }
-    
-    @Command(aliases = {"addmember", "addmember"}, usage = "<id> <members...>",
-            desc = "Add a member to a region", min = 2)
+
+    @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 {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        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);
@@ -64,19 +79,21 @@ public class RegionMemberCommands {

        id = region.getId();

-        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());
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addmember.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addmember.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.addmember." + id.toLowerCase());
+            }
        }

        RegionDBUtil.addToDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);

        sender.sendMessage(ChatColor.YELLOW
                + "Region '" + id + "' updated.");
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -84,15 +101,30 @@ public class RegionMemberCommands {
                    + e.getMessage());
        }
    }
-    
-    @Command(aliases = {"addowner", "addowner"}, usage = "<id> <owners...>",
-            desc = "Add an owner to a region", min = 2)
+
+    @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 {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        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);
@@ -106,22 +138,24 @@ public class RegionMemberCommands {

        Boolean flag = region.getFlag(DefaultFlag.BUYABLE);
        DefaultDomain owners = region.getOwners();
-        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.");
+        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());
+                plugin.checkPermission(sender, "worldguard.region.addowner.unclaimed." + id.toLowerCase());
            } else {
-                plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
+                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());
+                }
            }
        }

@@ -129,7 +163,7 @@ public class RegionMemberCommands {

        sender.sendMessage(ChatColor.YELLOW
                + "Region '" + id + "' updated.");
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -137,15 +171,30 @@ public class RegionMemberCommands {
                    + e.getMessage());
        }
    }
-    
-    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"}, usage = "<id> <owners...>",
-            desc = "Remove an owner to a region", min = 2)
+
+    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"},
+            usage = "<id> <owners...>",
+            flags = "w:",
+            desc = "Remove an owner to a region",
+            min = 2)
    public void removeMember(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        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);
@@ -157,19 +206,21 @@ public class RegionMemberCommands {

        id = region.getId();

-        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 (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());
+            }
        }

        RegionDBUtil.removeFromDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);

        sender.sendMessage(ChatColor.YELLOW
                + "Region '" + id + "' updated.");
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -177,16 +228,31 @@ public class RegionMemberCommands {
                    + e.getMessage());
        }
    }
-    
-    @Command(aliases = {"removeowner", "remowner"}, usage = "<id> <owners...>",
-            desc = "Remove an owner to a region", min = 2)
+
+    @Command(aliases = {"removeowner", "remowner"},
+            usage = "<id> <owners...>",
+            flags = "w:",
+            desc = "Remove an owner to a region",
+            min = 2)
    public void removeOwner(CommandContext args,
            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        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);
@@ -198,19 +264,21 @@ public class RegionMemberCommands {

        id = region.getId();

-        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 (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());
+            }
        }

        RegionDBUtil.removeFromDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);

        sender.sendMessage(ChatColor.YELLOW
                + "Region '" + id + "' updated.");
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -128,7 +128,7 @@ public class ToggleCommands {

                if (removed > 10) {
                    sender.sendMessage("" + removed + " entities (>10) auto-removed from "
-                            + world.toString());
+                            + world.getName());
                }
            }

@@ -36,12 +36,11 @@ 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.ProtectionDatabaseException;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
-import com.sk89q.worldguard.protection.databases.YAMLDatabase;
 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.FlatRegionManager;
 import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;

@@ -160,8 +159,10 @@ public class GlobalRegionManager {
            RegionManager manager = new PRTreeRegionManager(database);
            manager.load();

-            plugin.getLogger().info(manager.getRegions().size()
-                    + " regions loaded for '" + name + "'");
+            if (plugin.getGlobalStateManager().get(world).summaryOnStart) {
+                plugin.getLogger().info(manager.getRegions().size()
+                        + " regions loaded for '" + name + "'");
+            }

            return manager;
        } catch (ProtectionDatabaseException e) {
@@ -40,7 +40,7 @@ public final class DefaultFlag {
    public static final StateFlag OTHER_EXPLOSION = new StateFlag("other-explosion", true);
    public static final StateFlag SLEEP = new StateFlag("sleep", true);
    public static final StateFlag TNT = new StateFlag("tnt", true, RegionGroup.ALL);
-    public static final StateFlag LIGHTER = new StateFlag("lighter", true, RegionGroup.ALL);
+    public static final StateFlag LIGHTER = new StateFlag("lighter", false, RegionGroup.NON_MEMBERS);
    public static final StateFlag FIRE_SPREAD = new StateFlag("fire-spread", true);
    public static final StateFlag LAVA_FIRE = new StateFlag("lava-fire", true);
    public static final StateFlag LIGHTNING = new StateFlag("lightning", true);
@@ -59,6 +59,7 @@ public final class DefaultFlag {
    public static final StateFlag LEAF_DECAY = new StateFlag("leaf-decay", true);
    public static final StateFlag GRASS_SPREAD = new StateFlag("grass-growth", true);
    public static final StateFlag MYCELIUM_SPREAD = new StateFlag("mycelium-spread", true);
+    public static final StateFlag VINE_GROWTH = new StateFlag("vine-growth", true);
    public static final StateFlag ENDER_BUILD = new StateFlag("enderman-grief", true);
    public static final StateFlag INVINCIBILITY = new StateFlag("invincible", false, RegionGroup.ALL);
    public static final StateFlag EXP_DROPS = new StateFlag("exp-drops", true, RegionGroup.ALL);
@@ -89,6 +90,7 @@ public final class DefaultFlag {
    // public static final StringFlag MAX_PLAYERS_MESSAGE = new StringFlag("max-players-reject-message", RegionGroup.ALL);
    public static final LocationFlag TELE_LOC = new LocationFlag("teleport", RegionGroup.MEMBERS);
    public static final LocationFlag SPAWN_LOC = new LocationFlag("spawn", RegionGroup.MEMBERS);
+    public static final StateFlag ENABLE_SHOP = new StateFlag("allow-shop", false);
    public static final BooleanFlag BUYABLE = new BooleanFlag("buyable");
    public static final DoubleFlag PRICE = new DoubleFlag("price");
    public static final SetFlag<String> BLOCKED_CMDS = new SetFlag<String>("blocked-cmds", RegionGroup.ALL, new CommandStringFlag(null));
@@ -105,13 +107,12 @@ public final class DefaultFlag {
        HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL,
        FEED_DELAY, FEED_AMOUNT, MIN_FOOD, MAX_FOOD,
        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT, GAME_MODE,
-        MUSHROOMS, LEAF_DECAY, GRASS_SPREAD, MYCELIUM_SPREAD, SEND_CHAT,
-        RECEIVE_CHAT, FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
+        MUSHROOMS, LEAF_DECAY, GRASS_SPREAD, MYCELIUM_SPREAD, VINE_GROWTH,
+        SEND_CHAT, RECEIVE_CHAT, FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
        TELE_LOC, SPAWN_LOC, POTION_SPLASH,
-        BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE,
+        BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE, ENABLE_SHOP
    };

-
    private DefaultFlag() {
    }

@@ -19,10 +19,10 @@

 package com.sk89q.worldguard;

-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
+
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;

@org.junit.Ignore
 public class TestPlayer extends LocalPlayer {
@@ -49,32 +49,27 @@ public class TestPlayer extends LocalPlayer {

    @Override
    public Vector getPosition() {
-        // TODO Auto-generated method stub
-        return null;
+        return new Vector(0, 0, 0);
    }

    @Override
    public void kick(String msg) {
-        // TODO Auto-generated method stub
-        
+        System.out.println("TestPlayer{" + this.name + "} kicked!");
    }

    @Override
    public void ban(String msg) {
-        // TODO Auto-generated method stub
-        
+        System.out.println("TestPlayer{" + this.name + "} banned!");
    }

    @Override
    public void printRaw(String msg) {
-        // TODO Auto-generated method stub
-        
+        System.out.println("-> TestPlayer{" + this.name + "}: " + msg);
    }

    @Override
    public String[] getGroups() {
-        // TODO Auto-generated method stub
-        return null;
+        return groups.toArray(new String[groups.size()]);
    }

    @Override
@@ -0,0 +1,30 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+public class PRTreeRegionEntryExitTest extends RegionEntryExitTest {
+    @Override
+    protected RegionManager createRegionManager() throws Exception {
+        return new PRTreeRegionManager(null);
+    }
+}
@@ -0,0 +1,146 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2013 sk89q <http://www.sk89q.com> and contributors
+ *
+ * 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 org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.TestPlayer;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.RegionGroup;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+public abstract class RegionEntryExitTest {
+    static String ENTRY_ID = "entry_rg";
+    static String EXIT_ID = "exit_rg";
+    static String BUILDER_GROUP = "builder";
+    static String VIP_GROUP = "vip";
+
+    Vector inEntry = new Vector(5, 64, 5);
+    Vector inExit = new Vector(-5, 65, -5);
+
+    RegionManager manager;
+    ProtectedRegion globalRegion;
+    ProtectedRegion entryRegion;
+    ProtectedRegion exitRegion;
+    TestPlayer vip_player;
+    TestPlayer builder_player;
+
+    protected abstract RegionManager createRegionManager() throws Exception;
+
+    @Before
+    public void setUp() throws Exception {
+        setUpGlobalRegion();
+
+        manager = createRegionManager();
+
+        setUpPlayers();
+        setUpEntryRegion();
+        setUpExitRegion();
+    }
+
+    void setUpPlayers() {
+        vip_player = new TestPlayer("dudu");
+        vip_player.addGroup(VIP_GROUP);
+
+        builder_player = new TestPlayer("esskay");
+        builder_player.addGroup(BUILDER_GROUP);
+
+        // @Test
+        // assertFalse(builderPlayer.wuvs(vip_player)); // causes test to fail
+    }
+
+    void setUpGlobalRegion() {
+        globalRegion = new GlobalProtectedRegion("__global__");
+    }
+
+    void setUpEntryRegion() {
+        DefaultDomain domain = new DefaultDomain();
+        domain.addGroup(VIP_GROUP);
+
+        ProtectedRegion region = new ProtectedCuboidRegion(ENTRY_ID, new BlockVector(1, 0, 1), new BlockVector(10, 255, 10));
+
+        region.setMembers(domain);
+        manager.addRegion(region);
+
+        entryRegion = region;
+        // this is the way it's supposed to work
+        // whatever the group flag is set to is the group that the flag APPLIES to
+        // in this case, non members (esskay) should be DENIED entry
+        entryRegion.setFlag(DefaultFlag.ENTRY, StateFlag.State.DENY);
+        entryRegion.setFlag(DefaultFlag.ENTRY.getRegionGroupFlag(), RegionGroup.NON_MEMBERS);
+    }
+
+    void setUpExitRegion() throws Exception {
+        DefaultDomain domain = new DefaultDomain();
+        domain.addGroup(BUILDER_GROUP);
+
+        ProtectedRegion region = new ProtectedCuboidRegion(EXIT_ID, new BlockVector(-1, 0, -1), new BlockVector(-10, 255, -10));
+
+        region.setOwners(domain);
+        manager.addRegion(region);
+
+        entryRegion = region;
+        // same as above
+        entryRegion.setFlag(DefaultFlag.EXIT, StateFlag.State.DENY);
+        entryRegion.setFlag(DefaultFlag.EXIT.getRegionGroupFlag(), RegionGroup.NON_OWNERS);
+    }
+
+    @Test
+    public void testEntry() throws Exception {
+        ApplicableRegionSet appl;
+
+        appl = manager.getApplicableRegions(inEntry);
+//        ProtectedRegion rg = appl.iterator().next();
+//        System.out.println("rg   " + rg.getId());
+//        System.out.println("mem  " + rg.getMembers().toGroupsString());
+//        System.out.println("flag " + appl.getFlag(DefaultFlag.ENTRY));
+//        System.out.println("grp  " + appl.getFlag(DefaultFlag.ENTRY.getRegionGroupFlag()));
+//        System.out.println("===");
+        assertTrue("Allowed Entry", appl.allows(DefaultFlag.ENTRY, vip_player));
+        assertFalse("Forbidden Entry", appl.allows(DefaultFlag.ENTRY, builder_player));
+    }
+
+    @Test
+    public void testExit() throws Exception {
+        ApplicableRegionSet appl;
+
+        appl = manager.getApplicableRegions(inExit);
+//        ProtectedRegion rg = appl.iterator().next();
+//        System.out.println("rg   " + rg.getId());
+//        System.out.println("own  " + rg.getOwners().toGroupsString());
+//        System.out.println("flag " + appl.getFlag(DefaultFlag.EXIT));
+//        System.out.println("grp  " + appl.getFlag(DefaultFlag.EXIT.getRegionGroupFlag()));
+//        System.out.println("===");
+        assertTrue("Allowed Exit", appl.allows(DefaultFlag.EXIT, builder_player));
+        assertFalse("Forbidden Exit", appl.allows(DefaultFlag.EXIT, vip_player));
+    }
+
+}
@@ -19,6 +19,15 @@

 package com.sk89q.worldguard.protection;

+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
@@ -26,19 +35,11 @@ import com.sk89q.worldguard.TestPlayer;
 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.managers.FlatRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 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 org.junit.Before;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;

 public abstract class RegionOverlapTest {
    static String COURTYARD_ID = "courtyard";
@@ -166,7 +167,6 @@ public abstract class RegionOverlapTest {
        HashSet<ProtectedRegion> test = new HashSet<ProtectedRegion>();
        test.add(courtyard);
        test.add(fountain);
-        System.out.println(test);

        // Outside
        appl = manager.getApplicableRegions(outside);
Author	SHA1	Message	Date
wizjany	c35686f8d1	[maven-release-plugin] prepare release 5.7.5	2013-05-26 17:20:00 -04:00
wizjany	a5b6651582	Update CHANGELOG for 5.7.4 and 5.7.5	2013-05-26 17:10:35 -04:00
wizjany	54973fdf82	Large patch with lots of changes and fixes. - Unified movement checking. Teleporting is now handled by entry/exit flags. Additionally, a region movement event is much closer to being added. - Fixed an issue with enderpearls and exit/entry flags conflicting. - Fixed a null check issue in several commands. - Fixed allowed and blocked command flags making false matches and improved support for blocking/allowing specific command args.	2013-05-26 17:08:51 -04:00
wizjany	0bee631385	Use getName instead of toString for displaying world name.	2013-05-15 07:56:04 -04:00
wizjany	6283382837	Fixed a few movement flag related issues. WG no longer prefixes greeting/farewell flags with '', allowing people to customize the message. (Adding &c to the beginning of the message will give previous behavior) Removed the "game mode locked" message since it returns false gamemodes when being called inside a player move event.	2013-05-05 10:57:46 -04:00
Silthus	39bb522051	Fixes heal flag bugs when player.maxHealth > 20 With the new Bukkit Changes the Player Health can be above 20, this fixes the magic number by using the now built in Bukkit functionality. Examples of this bug were Health jumping to 1/20 hearts when having a heal-amount: -1	2013-05-04 11:47:43 +03:00
wizjany	bf80d57abe	Add fishing to xp blocker.	2013-04-21 08:59:24 -04:00
wizjany	865b94006a	Apply other-explosion flag to entity damage as well.	2013-04-09 17:23:56 -04:00
wizjany	874248f8b5	Fix other explosion flag only clearing blocklist	2013-04-09 12:25:05 -04:00
steffen	cef7d5bb12	Fix explosion check order If the explosion is blocked and the block damage is also blocked, it's necessary to block the explosion (which includes the damage) instead of just the block damage.	2013-04-01 18:34:11 -04:00
wizjany	2a8131780f	Don't ignore canceled air right click events. Apparently Bukkit pre-cancels them even if they would do something.	2013-03-31 19:13:05 -04:00
Wizjany	7094f70f4a	Remove duplicate check. (derp)	2013-03-31 19:13:04 -04:00
wizjany	df5af6129c	Improved lighter handling.	2013-03-23 21:10:30 -04:00
wizjany	a6888c3767	Respect LIGHTER flag for ignition build checks	2013-03-23 15:19:56 -04:00
wizjany	1bd367ddde	Fix one last witherskull/fireball conflict	2013-03-22 19:28:18 -04:00
wizjany	0cf87ae561	Allow cow milking in no-build areas	2013-03-22 15:35:30 -04:00
wizjany	fa80f5f67f	Fix infinite durability. For whatever reason, the Bukkit API thinks that 'Durability" and "Damage" are synonymous.	2013-03-18 13:25:11 -04:00
sk89q	7f080f920d	[maven-release-plugin] prepare for next development iteration	2013-03-16 22:17:14 -07:00
sk89q	13658323b4	[maven-release-plugin] prepare release 5.7.3	2013-03-16 22:16:51 -07:00
sk89q	2d440ab5ba	Cleaned up pom.xml.	2013-03-16 22:01:14 -07:00
sk89q	dc55673691	Updated changelog for 5.7.3.	2013-03-16 21:12:26 -07:00
wizjany	92bb3948a6	Fix for minecart naming	2013-03-16 21:47:31 -04:00
wizjany	f67ad6478c	[maven-release-plugin] prepare for next development iteration	2013-03-15 16:01:09 -04:00
wizjany	1d984198ce	[maven-release-plugin] prepare release 5.7.2	2013-03-15 16:01:02 -04:00
wizjany	f2ca980771	Update changelog to 5.7.2	2013-03-15 15:44:48 -04:00
wizjany	b826697aea	Add flag check to smelting/mining xp handling	2013-03-15 15:44:34 -04:00
wizjany	89430c13ec	Handle TNT Minecarts with tnt flag/settings.	2013-03-15 15:32:57 -04:00
Wizjany	f07acea3e1	Updated to MC 1.5	2013-03-15 14:42:20 -04:00
wizjany	e9402c55e6	Fixed a bunch of small bugs	2013-03-14 18:45:05 -04:00
wizjany	2eb6c76da8	Fix stack issue.	2013-03-13 14:38:28 -04:00
Wizjany	a34e48a145	Added unit test for entry and exit flags to put the matter to rest. Also cleaned up a few other things regarding tests.	2013-03-01 22:20:16 -05:00
Wizjany	2d50659b48	Apply exp flag and config setting to xp bottles. "Workaround" for not being able to blacklist exp bottles at the moment. Although I supposed I could have just fixed that instead, this allows more flexibility.	2013-02-21 10:20:47 -05:00
Wizjany	327ae2b807	Apply crop trampling setting to all entities.	2013-02-21 10:13:17 -05:00
Wizjany	dfb6114584	Fix a few wolf issues	2013-01-31 08:23:38 -05:00
Wizjany	5085841d9d	[maven-release-plugin] prepare for next development iteration	2013-01-30 16:26:26 -05:00
Wizjany	7a98944469	[maven-release-plugin] prepare release 5.7.1	2013-01-30 16:26:20 -05:00
Wizjany	3d2b455cda	Update changelog for 5.7.1	2013-01-30 16:21:55 -05:00
Wizjany	460d5d0691	Made wolves respect pvp stuff. Removed some extraneous code.	2013-01-30 15:27:52 -05:00
Wizjany	b5f80351ec	Allow a lot of commands to be sent from the console. Examples: /rg addmem <id> <player> -w <worldname> /rg flag <id> <flag> -w <worldname> <flagvalue> /rg remove <id> -w <worldname> Command blocks are currently untested. List of commands: flag, priority, parent, remove, addmember, removemember, addowner, removeowner	2013-01-30 14:45:29 -05:00
Wizjany	72a9472a57	Add vine growth flag and config option.	2013-01-30 14:02:45 -05:00
Wizjany	7eb820c688	Fixed bug where players could place beds on the borders of regions without permissions	2013-01-30 13:47:48 -05:00
Wizjany	886b279da6	Bugfixes for bonemeal and minecarts.	2013-01-27 22:43:29 -05:00
Wizjany	f2d7135fc5	Check shooter of projectile when one hits a hanging entity	2013-01-25 21:07:11 -05:00
Wizjany	d214a859c3	Check the block that the item frame will end in, not the block the player clicked.	2013-01-21 04:08:17 -05:00
Wizjany	d1e221c2b7	Don't cancel explosion if we only want to clear blocklist. May potentially cause issues with multiple settings overlapping.	2013-01-19 08:46:51 -05:00
Dark Arc	e0e4207a4d	Apply a cap to the health and hunger flags to prevent possible exceptions If a player's health or hunger is set to higher than its respective maximum CraftBukkit will throw exceptions.	2013-01-16 14:48:39 -05:00
Wizjany	4398c781c5	Wither skulls should be handled separately from fireballs	2013-01-15 18:23:53 -05:00
Wizjany	3e06000fd9	Workaround for CraftBukkit bug with slab placement	2013-01-15 16:06:42 -05:00
Wizjany	833795ebe1	Add enderchest and anvil to blacklist inventories.	2013-01-14 13:31:54 -05:00
Wizjany	6e270d5ec3	Setting summary-on-start to false reduces much more clutter now	2013-01-13 17:21:51 -05:00
Wizjany	09a9bea3a7	Move enderchest to use flag	2013-01-13 16:10:06 -05:00
Wizjany	035ccee2a6	Fixed placing stuff in flower pots. (derp)	2013-01-13 13:44:54 -05:00
Wizjany	17aa2a4153	Fix region teleport permission	2013-01-13 06:13:41 -05:00
Wizjany	f5bc5c0b47	That was not in there	2013-01-13 03:48:11 -05:00
Wizjany	e7a4afde7d	[maven-release-plugin] prepare for next development iteration	2013-01-13 03:08:17 -05:00