Handle BlockExplodeEvent as other explosion.

Also misc cleanup.
Closes #407, WORLDGUARD-3843.

.gitignore

@@ -4,10 +4,14 @@
 /target
 
 .DS_Store
-/*.iml
-/.idea
+
+**/*.iml
+**/.idea
 
 /bin
 /dependency-reduced-pom.xml
 *-private.sh
 
+/.gradle
+**/build
+

.travis.yml

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

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 6.1.2
+* Added support for new blocks in 1.8, 1.9, and 1.10.
+* Added protection from nether portals being created in protected region (enable via config `nether-portal-protection`).
+* Added protection from slime block piston contraptions pushing into or pulling from regions.
+* Added `chorus-fruit-teleport` flag, works similar to `enderpearl` to prevent teleportation.
+* Added protection from pulling armor stands, items, and entities from protected regions.
+* Changed order of greeting and farewell flags on adjacent regions. When leaving a region with a farewell flag and entering one with a greeting flag, the farewell message will be shown first now.
+* Changed /heal command to also fill food/saturation meters.
+* Changed fall damage prevention to also prevent flying into walls with elytra being fatal.
+* Fixed fire-spread flag only preventing destruction, now prevents spreading too as per its name.
+* Fixed creepers targeting players being able to blow things up in certain cases.
+* Fixed armor stands being removed by /stoplag.
+* Fixed some issues with fireballs being able to explode when ghast-fireball was set to deny.
+* Fixed a lot of other minor issues.
+
 ## 6.1
 
 * Added `exit-via-teleport` flag (default allow) to control exiting an exit=deny region via teleportation.

README.md

@@ -22,10 +22,10 @@ Compiling
 ---------
 
 The project is written for Java 6 and our build process makes use of
-[Maven](http://maven.apache.org). Detailed compilation information
+[Gradle](http://gradle.org). Detailed compilation information
 [can be found on the wiki](http://wiki.sk89q.com/wiki/WorldGuard/Development#Compiling).
 
-Dependencies are automatically handled by Maven.
+Dependencies are automatically handled by Gradle.
 
 Contributing
 ------------

build.gradle

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

config/checkstyle/checkstyle.xml

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

config/checkstyle/header.txt

@@ -15,4 +15,4 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+ */

config/checkstyle/import-control.xml

@@ -1,22 +1,3 @@
-<!--
-  ~ WorldGuard, a suite of tools for Minecraft
-  ~ Copyright (C) sk89q <http://www.sk89q.com>
-  ~ Copyright (C) WorldGuard team and contributors
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-  ~ for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
 <!DOCTYPE import-control PUBLIC
     "-//Puppy Crawl//DTD Import Control 1.1//EN"
     "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
@@ -25,17 +6,29 @@
   <allow pkg="java"/>
   <allow pkg="javax"/>
   <allow pkg="org.junit"/>
-  <allow pkg="junit"/>
-  <allow pkg="org.mockito"/>
   <allow pkg="org.hamcrest"/>
+  <allow pkg="org.mockito"/>
   <allow pkg="com.sk89q"/>
-  <allow pkg="org.enginehub"/>
-  <allow pkg="org.bukkit"/>
-  <allow pkg="org.yaml.snakeyaml"/>
-  <allow pkg="au.com.bytecode.opencsv"/>
-  <allow pkg="org.khelekore.prtree"/>
   <allow pkg="com.google.common"/>
-  <allow pkg="com.jolbox.bonecp"/>
-  <allow pkg="org.flywaydb.core"/>
-  <allow pkg="org.json.simple"/>
-</import-control>
+
+  <subpackage name="worldguard">
+    <allow pkg="org.khelekore"/>
+    <allow pkg="org.flywaydb"/>
+
+    <subpackage name="bukkit">
+      <allow pkg="org.bukkit"/>
+      <allow pkg="net.minecraft.server"/>
+    </subpackage>
+
+    <subpackage name="sponge">
+      <allow pkg="org.spongepowered"/>
+      <allow pkg="com.flowpowered"/>
+    </subpackage>
+
+    <subpackage name="forge">
+      <allow pkg="net.minecraft"/>
+      <allow pkg="net.minecraftforge"/>
+    </subpackage>
+  </subpackage>
+
+</import-control>

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

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

pom.xml

@@ -1,525 +0,0 @@
-<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>6.1</version>
-  <packaging>jar</packaging>
-  
-  <!-- Project information -->
-  <name>WorldGuard</name>
-  <description>WorldGuard protects your Minecraft servers.</description>
-  <licenses>
-    <license>
-      <name>GNU General Public License 2.0</name>
-      <url>LICENSE.txt</url>
-      <distribution>repo</distribution>
-      <comments>License on all contributions</comments>
-    </license>
-  </licenses>
-  
-  <issueManagement>
-    <system>YouTrack</system>
-    <url>http://youtrack.sk89q.com</url>
-  </issueManagement>
-  
-  <ciManagement>
-    <system>Jenkins</system>
-    <url>http://build.sk89q.com</url>
-  </ciManagement>
-  
-  <scm>
-    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
-    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
-    <url>https://github.com/sk89q/worldguard</url>
-    <tag>master</tag>
-  </scm>
-  
-  <mailingLists>
-    <mailingList>
-      <name>Developer Discussion</name>
-      <archive>https://groups.google.com/d/forum/sk-dev-discuss</archive>
-    </mailingList>
-  </mailingLists>
-  
-  <distributionManagement>
-    <site>
-      <id>sk89q-docs-upload</id>
-      <url>ftp://sk89q-maven-deploy/worldguard/</url>
-    </site>
-    <repository>
-      <id>maven.sk89q.com</id>
-      <url>http://maven.sk89q.com/artifactory/libs-release-local</url>
-    </repository>
-    <snapshotRepository>
-      <id>maven.sk89q.com-snapshot</id>
-      <url>http://maven.sk89q.com/artifactory/libs-snapshot-local</url>
-    </snapshotRepository>
-  </distributionManagement>
-  
-  <properties> <!-- Fix encoding warnings -->
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  
-  <repositories>
-    <repository>
-      <id>sk89q-repo</id>
-      <url>http://maven.sk89q.com/repo/</url>
-    </repository>
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-    </repository>
-  </repositories>
-  
-  <dependencies>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldedit</artifactId>
-      <version>5.5.8</version>
-      <scope>compile</scope>
-      <type>jar</type>
-      <exclusions>
-        <exclusion>
-          <groupId>com.zachsthings.libcomponents</groupId>
-          <artifactId>libcomponents-bukkit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bukkit</groupId>
-          <artifactId>bukkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>com.sk89q.spigot</groupId>
-      <artifactId>bukkit-classloader-check</artifactId>
-      <version>1.8-R0.1-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.8.6-R0.1-SNAPSHOT</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>commandbook</artifactId>
-      <version>2.3</version>
-      <scope>compile</scope>
-      <type>jar</type>
-      <exclusions>
-        <exclusion>
-          <groupId>com.zachsthings.libcomponents</groupId>
-          <artifactId>libcomponents-bukkit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.spout</groupId>
-          <artifactId>spoutapi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bukkit</groupId>
-          <artifactId>bukkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.nijikokun</groupId>
-      <artifactId>iconomy</artifactId>
-      <version>5.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <!-- Contains parts of Guava that are not compatible
-           between Bukkit 10.0.1 and 17+ -->
-      <groupId>com.sk89q</groupId>
-      <artifactId>guavabackport</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>1.3.9</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>1.1.1</version>
-    </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>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>org.flywaydb</groupId>
-      <artifactId>flyway-core</artifactId>
-      <version>3.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>squirrelid</artifactId>
-      <version>0.1.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-      <type>jar</type>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>1.2.1</version>
-      <scope>test</scope>
-      <optional>true</optional>
-    </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>
-      <resource>
-        <targetPath>migrations/</targetPath>
-        <filtering>false</filtering>
-        <directory>${basedir}/src/main/resources/migrations/</directory>
-      </resource>
-    </resources>
-
-    <plugins>
-      <!-- Check style -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.12</version>
-        <executions>
-          <execution>
-            <id>verify-style</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <sourceDirectory>${basedir}/src</sourceDirectory>
-          <consoleOutput>true</consoleOutput>
-          <failsOnError>true</failsOnError>
-          <logViolationsToConsole>true</logViolationsToConsole>
-          <checkstyleRules>
-            <module name="Checker">
-              <!-- Tabs are strictly banned -->
-              <module name="FileTabCharacter"/>
-
-              <module name="TreeWalker">
-                <!-- Important basics -->
-                <!-- <module name="PackageDeclaration"/> Unlikely that we would miss this in a PR -->
-                <module name="OuterTypeFilename"/> <!-- TypeName -> TypeName.java -->
-
-                <!--
-                Control package usage, so people don't insert Bukkit into WE where it shouldn't belong, etc.
-                It is a bit draconian, so update as necessary!
-                -->
-                <module name="ImportControl">
-                  <property name="file" value="${basedir}/config/checkstyle/import-control.xml"/>
-                </module>
-
-                <!-- Code -->
-                <module name="HideUtilityClassConstructor"/> <!-- Utility classes should not have a constructor -->
-                <module name="CovariantEquals"/>
-                <module name="EqualsHashCode"/> <!-- equals() and hashCode() go together -->
-                <module name="NestedTryDepth"> <!-- SHOULD not need to adjust this -->
-                  <property name="max" value="2"/>
-                </module>
-                <module name="SuperFinalize"/> <!-- We don't actually use this -->
-                <module name="JUnitTestCase"/> <!-- Checks tearDown(), setUp() etc. -->
-
-                <!-- Style -->
-                <module name="LeftCurly"> <!-- Left brace never goes on another line -->
-                  <property name="option" value="eol"/>
-                </module> <!-- We don't check right brance -->
-                <module name="DefaultComesLast"/> <!-- default case in switch should be last -->
-                <module name="GenericWhitespace"/>
-
-                <!-- Naming -->
-                <module name="ClassTypeParameterName">
-                  <property name="format" value="^[A-Z][a-zA-Z0-9]*$"/>
-                </module>
-                <module name="LocalFinalVariableName"/>
-                <module name="LocalVariableName">
-                  <property name="format" value="^[a-z_][a-zA-Z0-9]*$"/>
-                </module>
-                <module name="MemberName">
-                  <property name="format" value="^[a-z_][a-zA-Z0-9]*$"/>
-                </module>
-                <module name="MethodName">
-                  <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-                </module>
-                <!-- <module name="PackageName"/> Unlikely that we would miss this in a PR -->
-                <module name="ParameterName"/>
-                <!-- <module name="TypeName"/> Unlikely that we would miss this in a PR -->
-              </module>
-
-              <!-- Require the header, something that many people forget and we hate to fix -->
-              <!-- You should configure the header in your IDE -->
-              <module name="Header">
-                <property name="headerFile" value="${basedir}/config/checkstyle/header.txt"/>
-                <property name="fileExtensions" value="java"/>
-              </module>
-            </module>
-          </checkstyleRules>
-        </configuration>
-      </plugin>
-
-      <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>
-                  <include>org.flywaydb:flyway-core</include>
-                  <include>com.sk89q:squirrelid</include>
-                  <include>com.sk89q:guavabackport</include>
-                  <include>com.googlecode.json-simple:json-simple</include>
-                </includes>
-              </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>com.sk89q.guavabackport</pattern>
-                  <shadedPattern>com.sk89q.worldguard.internal.guava</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.flywaydb</pattern>
-                  <shadedPattern>com.sk89q.worldguard.internal.flywaydb</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>com.sk89q.squirrelid</pattern>
-                  <shadedPattern>com.sk89q.worldguard.util.profile</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.json.simple</pattern>
-                  <shadedPattern>com.sk89q.worldguard.util.jsonsimple</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>com.ruleoftech</groupId>
-        <artifactId>markdown-page-generator-plugin</artifactId>
-        <version>0.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <inputDirectory>${basedir}</inputDirectory>
-          <outputDirectory>${project.build.directory}</outputDirectory>
-          <headerHtmlFile>${project.basedir}/config/markdown/header.html</headerHtmlFile>
-          <footerHtmlFile>${project.basedir}/config/markdown/footer.html</footerHtmlFile>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <configuration>
-          <descriptor>${basedir}/config/assembly/default.xml</descriptor>
-        </configuration>
-        <executions>
-          <execution>
-            <id>release</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.4.1</version>
-        <configuration>
-          <preparationGoals>assembly:assembly</preparationGoals>
-          <goals>assembly:assembly</goals>
-          <tagNameFormat>@{project.version}</tagNameFormat>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-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>
-        <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </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>

settings.gradle

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

src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java

@@ -1,97 +0,0 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.bukkit.listener;
-
-import com.sk89q.worldguard.bukkit.BukkitUtil;
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
-import com.sk89q.worldguard.bukkit.WorldConfiguration;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.bukkit.event.inventory.UseItemEvent;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.Potion;
-import org.bukkit.potion.PotionEffect;
-
-/**
- * Handles blocked potions.
- */
-public class BlockedPotionsListener extends AbstractListener {
-
-    /**
-     * Construct the listener.
-     *
-     * @param plugin an instance of WorldGuardPlugin
-     */
-    public BlockedPotionsListener(WorldGuardPlugin plugin) {
-        super(plugin);
-    }
-
-    @EventHandler
-    public void onItemInteract(UseItemEvent event) {
-        ConfigurationManager cfg = getPlugin().getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getWorld());
-        ItemStack item = event.getItemStack();
-
-        // We only care about portions
-        if (item.getType() != Material.POTION || BukkitUtil.isWaterPotion(item)) {
-            return;
-        }
-
-        if (!wcfg.blockPotions.isEmpty()) {
-            PotionEffect blockedEffect = null;
-
-            Potion potion = Potion.fromDamage(BukkitUtil.getPotionEffectBits(item));
-
-            // Find the first blocked effect
-            for (PotionEffect effect : potion.getEffects()) {
-                if (wcfg.blockPotions.contains(effect.getType())) {
-                    blockedEffect = effect;
-                    break;
-                }
-            }
-
-            if (blockedEffect != null) {
-                Player player = event.getCause().getFirstPlayer();
-
-                if (player != null) {
-                    if (getPlugin().hasPermission(player, "worldguard.override.potions")) {
-                        if (potion.isSplash() && wcfg.blockPotionsAlways) {
-                            player.sendMessage(ChatColor.RED + "Sorry, potions with " +
-                                    blockedEffect.getType().getName() + " can't be thrown, " +
-                                    "even if you have a permission to bypass it, " +
-                                    "due to limitations (and because overly-reliable potion blocking is on).");
-                            event.setCancelled(true);
-                        }
-                    } else {
-                        player.sendMessage(ChatColor.RED + "Sorry, potions with "
-                                + blockedEffect.getType().getName() + " are presently disabled.");
-                        event.setCancelled(true);
-                    }
-                } else {
-                    event.setCancelled(true);
-                }
-            }
-        }
-    }
-
-}

worldguard-core/build.gradle

@@ -0,0 +1,23 @@
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+
+dependencies {
+    compile 'com.sk89q.worldedit:worldedit-core:6.1.1-SNAPSHOT'
+    compile 'com.sk89q.intake:intake:4.2-SNAPSHOT'
+    compile 'com.sk89q:squirrelid:0.1.0'
+    compile 'org.flywaydb:flyway-core:3.0'
+    compile 'org.khelekore:prtree:1.5.0'
+}
+
+sourceSets {
+    main {
+        java {
+	    srcDir 'src/main/java'
+	}
+        resources {
+	    srcDir 'src/main/resources'
+	}
+    }
+}
+
+build.dependsOn(shadowJar)

worldguard-legacy/build.gradle

@@ -0,0 +1,55 @@
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+
+project.version = '6.2.2-SNAPSHOT'
+ext.internalVersion = project.version + ";" + gitCommitHash
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+checkstyle.configFile = new File(projectDir, "config/checkstyle/checkstyle.xml")
+
+dependencies {
+    compile 'org.khelekore:prtree:1.5.0'
+    compile 'org.bukkit:bukkit:1.12-R0.1-SNAPSHOT'
+    compile 'com.sk89q.worldedit:worldedit-bukkit:6.1.3-SNAPSHOT'
+    compile 'com.sk89q:squirrelid:0.1.0'
+    compile 'org.flywaydb:flyway-core:3.0'
+    compile ('com.sk89q:commandbook:2.3') {
+        exclude group: 'com.sk89q', module: 'worldedit'
+        exclude group: 'com.zachsthings.libcomponents'
+    }
+    compile 'net.sf.opencsv:opencsv:2.0'
+    compile 'com.googlecode.json-simple:json-simple:1.1.1'
+    compile 'com.google.code.findbugs:jsr305:1.3.9'
+    testCompile 'junit:junit:4.11'
+    testCompile 'org.hamcrest:hamcrest-library:1.2.1'
+}
+
+processResources {
+    from (sourceSets.main.resources.srcDirs) {
+        expand project.properties
+        include 'plugin.yml'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        exclude 'plugin.yml'
+    }
+}
+
+shadowJar {
+    dependencies {
+        include(dependency('org.khelekore:prtree:1.5.0'))
+        include(dependency('com.sk89q:squirrelid:0.1.0'))
+        include(dependency('org.flywaydb:flyway-core:3.0'))
+        include(dependency('com.googlecode.json-simple:json-simple:1.1.1'))
+        include(dependency('net.sf.opencsv:opencsv:2.0'))
+    }
+
+    relocate('org.flywaydb', 'com.sk89q.worldguard.internal.flywaydb')
+    relocate('com.sk89q.squirrelid', 'com.sk89q.worldguard.util.profile')
+    relocate('org.json.simple', 'com.sk89q.worldguard.util.jsonsimple')
+
+}
+
+build.dependsOn(shadowJar)

worldguard-legacy/config/checkstyle/checkstyle.xml

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

worldguard-legacy/config/checkstyle/import-control.xml

@@ -0,0 +1,41 @@
+<!--
+  ~ WorldGuard, a suite of tools for Minecraft
+  ~ Copyright (C) sk89q <http://www.sk89q.com>
+  ~ Copyright (C) WorldGuard team and contributors
+  ~
+  ~ This program is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+  ~ for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<!DOCTYPE import-control PUBLIC
+    "-//Puppy Crawl//DTD Import Control 1.1//EN"
+    "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
+
+<import-control pkg="com.sk89q">
+  <allow pkg="java"/>
+  <allow pkg="javax"/>
+  <allow pkg="org.junit"/>
+  <allow pkg="junit"/>
+  <allow pkg="org.mockito"/>
+  <allow pkg="org.hamcrest"/>
+  <allow pkg="com.sk89q"/>
+  <allow pkg="org.enginehub"/>
+  <allow pkg="org.bukkit"/>
+  <allow pkg="org.yaml.snakeyaml"/>
+  <allow pkg="au.com.bytecode.opencsv"/>
+  <allow pkg="org.khelekore.prtree"/>
+  <allow pkg="com.google.common"/>
+  <allow pkg="com.jolbox.bonecp"/>
+  <allow pkg="org.flywaydb.core"/>
+  <allow pkg="org.json.simple"/>
+</import-control>

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

@@ -1,122 +1,122 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.domains.Association;
-import com.sk89q.worldguard.protection.association.RegionAssociable;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-
-import java.util.List;
-import java.util.UUID;
-
-public abstract class LocalPlayer implements RegionAssociable {
-
-    /**
-     * Get this player's name.
-     * 
-     * @return The player's name
-     */
-    public abstract String getName();
-
-    /**
-     * Get this player's unique ID.
-     *
-     * @return a UUID
-     */
-    public abstract UUID getUniqueId();
-    
-    /**
-     * Returns true if this player is inside a group.
-     * 
-     * @param group The group to check
-     * @return Whether this player is in {@code group}
-     */
-    public abstract boolean hasGroup(String group);
-    
-    /**
-     * Get this player's position.
-     * 
-     * @return The player's position
-     */
-    public abstract Vector getPosition();
-    
-    /**
-     * Kick this player.
-     * 
-     * @param msg The message to kick the player with
-     */
-    public abstract void kick(String msg);
-    
-    /**
-     * Ban this player.
-     * 
-     * @param msg The message to ban the player with
-     */
-    public abstract void ban(String msg);
-    
-    /**
-     * Send this player a message.
-     * 
-     * @param msg The message to send to the player
-     */
-    public abstract void printRaw(String msg);
-    
-    /**
-     * Get this player's list of groups.
-     * 
-     * @return The groups this player is in
-     */
-    public abstract String[] getGroups();
-    
-    /**
-     * Returns whether this player has permission.
-     * 
-     * @param perm The permission to check
-     * @return Whether this player has {@code perm}
-     */
-    public abstract boolean hasPermission(String perm);
-
-    @Override
-    public Association getAssociation(List<ProtectedRegion> regions) {
-        boolean member = false;
-
-        for (ProtectedRegion region : regions) {
-            if (region.isOwner(this)) {
-                return Association.OWNER;
-            } else if (!member && region.isMember(this)) {
-                member = true;
-            }
-        }
-
-        return member ? Association.MEMBER : Association.NON_MEMBER;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName());
-    }
-    
-    @Override
-    public int hashCode() {
-        return getName().hashCode();
-    }
-
-}
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.domains.Association;
+import com.sk89q.worldguard.protection.association.RegionAssociable;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+import java.util.List;
+import java.util.UUID;
+
+public abstract class LocalPlayer implements RegionAssociable {
+
+    /**
+     * Get this player's name.
+     * 
+     * @return The player's name
+     */
+    public abstract String getName();
+
+    /**
+     * Get this player's unique ID.
+     *
+     * @return a UUID
+     */
+    public abstract UUID getUniqueId();
+    
+    /**
+     * Returns true if this player is inside a group.
+     * 
+     * @param group The group to check
+     * @return Whether this player is in {@code group}
+     */
+    public abstract boolean hasGroup(String group);
+    
+    /**
+     * Get this player's position.
+     * 
+     * @return The player's position
+     */
+    public abstract Vector getPosition();
+    
+    /**
+     * Kick this player.
+     * 
+     * @param msg The message to kick the player with
+     */
+    public abstract void kick(String msg);
+    
+    /**
+     * Ban this player.
+     * 
+     * @param msg The message to ban the player with
+     */
+    public abstract void ban(String msg);
+    
+    /**
+     * Send this player a message.
+     * 
+     * @param msg The message to send to the player
+     */
+    public abstract void printRaw(String msg);
+    
+    /**
+     * Get this player's list of groups.
+     * 
+     * @return The groups this player is in
+     */
+    public abstract String[] getGroups();
+    
+    /**
+     * Returns whether this player has permission.
+     * 
+     * @param perm The permission to check
+     * @return Whether this player has {@code perm}
+     */
+    public abstract boolean hasPermission(String perm);
+
+    @Override
+    public Association getAssociation(List<ProtectedRegion> regions) {
+        boolean member = false;
+
+        for (ProtectedRegion region : regions) {
+            if (region.isOwner(this)) {
+                return Association.OWNER;
+            } else if (!member && region.isMember(this)) {
+                member = true;
+            }
+        }
+
+        return member ? Association.MEMBER : Association.NON_MEMBER;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName());
+    }
+    
+    @Override
+    public int hashCode() {
+        return getName().hashCode();
+    }
+
+}

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

@@ -26,9 +26,9 @@ import com.sk89q.worldguard.blacklist.event.EventType;
 import com.sk89q.worldguard.blacklist.target.TargetMatcher;
 import com.sk89q.worldguard.blacklist.target.TargetMatcherParseException;
 import com.sk89q.worldguard.blacklist.target.TargetMatcherParser;
-import com.sk89q.guavabackport.cache.CacheBuilder;
-import com.sk89q.guavabackport.cache.CacheLoader;
-import com.sk89q.guavabackport.cache.LoadingCache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.sk89q.worldguard.bukkit.commands.CommandUtils;
 import org.bukkit.ChatColor;
 

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

@@ -23,7 +23,7 @@ import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.action.Action;
 import com.sk89q.worldguard.blacklist.action.ActionResult;
 import com.sk89q.worldguard.blacklist.event.BlacklistEvent;
-import com.sk89q.guavabackport.cache.LoadingCache;
+import com.google.common.cache.LoadingCache;
 
 import javax.annotation.Nullable;
 import java.util.*;

worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java

@@ -21,7 +21,7 @@ package com.sk89q.worldguard.blacklist.target;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
-import com.sk89q.guavabackport.collect.Range;
+import com.google.common.collect.Range;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.util.Enums;
 import org.bukkit.Material;
@@ -53,16 +53,16 @@ public class TargetMatcherParser {
         try {
             return Integer.parseInt(input);
         } catch (NumberFormatException e) {
-            int id = getItemID(input);
-            if (id > 0) {
-                return id;
-            }
-            
             Material material = Enums.findFuzzyByValue(Material.class, input);
             if (material != null) {
                 return material.getId();
             }
 
+            int id = getItemID(input);
+            if (id > 0) {
+                return id;
+            }
+
             throw new TargetMatcherParseException("Unknown block or item name: " + input);
         }
     }

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

@@ -1,111 +1,112 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-import java.util.UUID;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public class BukkitPlayer extends LocalPlayer {
-
-    private final WorldGuardPlugin plugin;
-    private final Player player;
-    private final String name;
-    private final boolean silenced;
-
-    public BukkitPlayer(WorldGuardPlugin plugin, Player player) {
-        this(plugin, player, false);
-    }
-
-    BukkitPlayer(WorldGuardPlugin plugin, Player player, boolean silenced) {
-        checkNotNull(plugin);
-        checkNotNull(player);
-
-        this.plugin = plugin;
-        this.player = player;
-        // getName() takes longer than before in newer versions of Minecraft
-        this.name = player.getName();
-        this.silenced = silenced;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public UUID getUniqueId() {
-        return player.getUniqueId();
-    }
-
-    @Override
-    public boolean hasGroup(String group) {
-        return plugin.inGroup(player, group);
-    }
-
-    @Override
-    public Vector getPosition() {
-        Location loc = player.getLocation();
-        return new Vector(loc.getX(), loc.getY(), loc.getZ());
-    }
-
-    @Override
-    public void kick(String msg) {
-        if (!silenced) {
-            player.kickPlayer(msg);
-        }
-    }
-
-    @Override
-    public void ban(String msg) {
-        if (!silenced) {
-            player.setBanned(true);
-            player.kickPlayer(msg);
-        }
-    }
-
-    @Override
-    public String[] getGroups() {
-        return plugin.getGroups(player);
-    }
-
-    @Override
-    public void printRaw(String msg) {
-        if (!silenced) {
-            player.sendMessage(msg);
-        }
-    }
-
-    @Override
-    public boolean hasPermission(String perm) {
-        return plugin.hasPermission(player, perm);
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-}
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.bukkit;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import org.bukkit.BanList.Type;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import java.util.UUID;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class BukkitPlayer extends LocalPlayer {
+
+    private final WorldGuardPlugin plugin;
+    private final Player player;
+    private final String name;
+    private final boolean silenced;
+
+    public BukkitPlayer(WorldGuardPlugin plugin, Player player) {
+        this(plugin, player, false);
+    }
+
+    BukkitPlayer(WorldGuardPlugin plugin, Player player, boolean silenced) {
+        checkNotNull(plugin);
+        checkNotNull(player);
+
+        this.plugin = plugin;
+        this.player = player;
+        // getName() takes longer than before in newer versions of Minecraft
+        this.name = player.getName();
+        this.silenced = silenced;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public UUID getUniqueId() {
+        return player.getUniqueId();
+    }
+
+    @Override
+    public boolean hasGroup(String group) {
+        return plugin.inGroup(player, group);
+    }
+
+    @Override
+    public Vector getPosition() {
+        Location loc = player.getLocation();
+        return new Vector(loc.getX(), loc.getY(), loc.getZ());
+    }
+
+    @Override
+    public void kick(String msg) {
+        if (!silenced) {
+            player.kickPlayer(msg);
+        }
+    }
+
+    @Override
+    public void ban(String msg) {
+        if (!silenced) {
+            Bukkit.getBanList(Type.NAME).addBan(player.getName(), null, null, null);
+            player.kickPlayer(msg);
+        }
+    }
+
+    @Override
+    public String[] getGroups() {
+        return plugin.getGroups(player);
+    }
+
+    @Override
+    public void printRaw(String msg) {
+        if (!silenced) {
+            player.sendMessage(msg);
+        }
+    }
+
+    @Override
+    public boolean hasPermission(String perm) {
+        return plugin.hasPermission(player, perm);
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+}

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

@@ -1,401 +1,408 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.bukkit;
-
-import com.google.common.collect.ImmutableList;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldedit.blocks.BlockType;
-import com.sk89q.worldedit.blocks.ItemID;
-import com.sk89q.worldguard.blacklist.target.MaterialTarget;
-import com.sk89q.worldguard.blacklist.target.Target;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import org.bukkit.*;
-import org.bukkit.block.Block;
-import org.bukkit.entity.*;
-import org.bukkit.inventory.ItemStack;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public class BukkitUtil {
-
-    private static Method ONLINE_PLAYERS_METHOD;
-
-    private BukkitUtil()  {
-
-    }
-
-    /**
-     * Converts the location of a Bukkit block to a WorldEdit vector.
-     *
-     * @param block The block to convert
-     * @return The block's location as a BlockVector
-     */
-    public static BlockVector toVector(Block block) {
-        return new BlockVector(block.getX(), block.getY(), block.getZ());
-    }
-
-    /**
-     * Converts a Bukkit location to a WorldEdit vector.
-     *
-     * @param loc A Bukkit Location
-     * @return A Vector with the location's x, y, and z values
-     */
-    public static Vector toVector(Location loc) {
-        return new Vector(loc.getX(), loc.getY(), loc.getZ());
-    }
-
-    /**
-     * Converts a Bukkit vector to a WorldEdit vector.
-     *
-     * @param vector The Bukkit vector
-     * @return A WorldEdit vector with the same values as the Bukkit vector.
-     */
-    public static Vector toVector(org.bukkit.util.Vector vector) {
-        return new Vector(vector.getX(), vector.getY(), vector.getZ());
-    }
-
-    /**
-     * Converts a WorldEdit vector to a Bukkit location.
-     *
-     * @param world The World to create the new Location with
-     * @param vec The vector to use for coordinates
-     * @return The Vector as a location with a World of world
-     */
-    public static Location toLocation(World world, Vector vec) {
-        return new Location(world, vec.getX(), vec.getY(), vec.getZ());
-    }
-
-    /**
-     * Create a dummy region that encompasses the size of a chunk.
-     *
-     * @param chunk The chunk
-     * @return The dummy region
-     */
-    public static ProtectedRegion toRegion(Chunk chunk) {
-        World world = chunk.getWorld();
-
-        int minX = chunk.getX() << 4;
-        int minZ = chunk.getZ() << 4;
-        return new ProtectedCuboidRegion("_", new BlockVector(minX, 0, minZ), new BlockVector(minX + 15, world.getMaxHeight(), minZ + 15));
-    }
-
-    /**
-     * Matches one player based on name.
-     *
-     * @param server The server to check
-     * @param name The name to attempt to match
-     * @deprecated see {@link WorldGuardPlugin#matchSinglePlayer(org.bukkit.command.CommandSender, String)}
-     * @return The matched player if any, otherwise null
-     */
-    @Deprecated
-    public static Player matchSinglePlayer(Server server, String name) {
-        List<Player> players = server.matchPlayer(name);
-        if (players.size() == 0) {
-            return null;
-        }
-        return players.get(0);
-    }
-
-    /**
-     * Drops a sign item and removes a sign.
-     *
-     * @param block The block
-     * @deprecated see {@link org.bukkit.block.Block#breakNaturally()}
-     */
-    @Deprecated
-    public static void dropSign(Block block) {
-        block.setTypeId(0);
-        block.getWorld().dropItemNaturally(block.getLocation(),
-                new ItemStack(ItemID.SIGN, 1));
-    }
-
-    /**
-     * Sets the given block to fluid water.
-     * Used by addSpongeWater()
-     *
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     */
-    public static void setBlockToWater(World world, int ox, int oy, int oz) {
-        Block block = world.getBlockAt(ox, oy, oz);
-        int id = block.getTypeId();
-        if (id == 0) {
-            block.setTypeId(8);
-        }
-    }
-
-    /**
-     * Checks if the given block is water
-     *
-     * @param world the world
-     * @param ox x
-     * @param oy y
-     * @param oz z
-     * @return true if it's water
-     */
-    public static boolean isBlockWater(World world, int ox, int oy, int oz) {
-        Block block = world.getBlockAt(ox, oy, oz);
-        int id = block.getTypeId();
-        return id == 8 || id == 9;
-    }
-
-    /**
-     * Checks if the given potion is a vial of water.
-     *
-     * @param item the item to check
-     * @return true if it's a water vial
-     */
-    public static boolean isWaterPotion(ItemStack item) {
-        return (item.getDurability() & 0x3F) == 0;
-    }
-
-    /**
-     * Get just the potion effect bits. This is to work around bugs with potion
-     * parsing.
-     *
-     * @param item item
-     * @return new bits
-     */
-    public static int getPotionEffectBits(ItemStack item) {
-        return item.getDurability() & 0x3F;
-    }
-
-    /**
-     * Find a position for the player to stand that is not inside a block.
-     * Blocks above the player will be iteratively tested until there is
-     * a series of two free blocks. The player will be teleported to
-     * that free position.
-     *
-     * @param player
-     */
-    public static void findFreePosition(Player player) {
-        Location loc = player.getLocation();
-        int x = loc.getBlockX();
-        int y = Math.max(0, loc.getBlockY());
-        int origY = y;
-        int z = loc.getBlockZ();
-        World world = player.getWorld();
-
-        byte free = 0;
-
-        while (y <= world.getMaxHeight() + 1) {
-            if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) {
-                free++;
-            } else {
-                free = 0;
-            }
-
-            if (free == 2) {
-                if (y - 1 != origY || y == 1) {
-                    loc.setX(x + 0.5);
-                    loc.setY(y);
-                    loc.setZ(z + 0.5);
-                    if (y <= 2 && world.getBlockAt(x,0,z).getTypeId() == BlockID.AIR) {
-                        world.getBlockAt(x,0,z).setTypeId(20);
-                        loc.setY(2);
-                    }
-                    player.setFallDistance(0F);
-                    player.teleport(loc);
-                }
-                return;
-            }
-
-            y++;
-        }
-    }
-
-    /**
-     * Replace color macros in a string. The macros are in the form of `[char]
-     * where char represents the color. R is for red, Y is for yellow,
-     * G is for green, C is for cyan, B is for blue, and P is for purple.
-     * The uppercase versions of those are the darker shades, while the
-     * lowercase versions are the lighter shades. For white, it's 'w', and
-     * 0-2 are black, dark grey, and grey, respectively.
-     *
-     * @param str
-     * @return color-coded string
-     */
-    public static String replaceColorMacros(String str) {
-        str = str.replace("&r", ChatColor.RED.toString());
-        str = str.replace("&R", ChatColor.DARK_RED.toString());
-
-        str = str.replace("&y", ChatColor.YELLOW.toString());
-        str = str.replace("&Y", ChatColor.GOLD.toString());
-
-        str = str.replace("&g", ChatColor.GREEN.toString());
-        str = str.replace("&G", ChatColor.DARK_GREEN.toString());
-
-        str = str.replace("&c", ChatColor.AQUA.toString());
-        str = str.replace("&C", ChatColor.DARK_AQUA.toString());
-
-        str = str.replace("&b", ChatColor.BLUE.toString());
-        str = str.replace("&B", ChatColor.DARK_BLUE.toString());
-
-        str = str.replace("&p", ChatColor.LIGHT_PURPLE.toString());
-        str = str.replace("&P", ChatColor.DARK_PURPLE.toString());
-
-        str = str.replace("&0", ChatColor.BLACK.toString());
-        str = str.replace("&1", ChatColor.DARK_GRAY.toString());
-        str = str.replace("&2", ChatColor.GRAY.toString());
-        str = str.replace("&w", ChatColor.WHITE.toString());
-
-        str = str.replace("&k", ChatColor.MAGIC.toString());
-        str = str.replace("&l", ChatColor.BOLD.toString());
-        str = str.replace("&m", ChatColor.STRIKETHROUGH.toString());
-        str = str.replace("&n", ChatColor.UNDERLINE.toString());
-        str = str.replace("&o", ChatColor.ITALIC.toString());
-
-        str = str.replace("&x", ChatColor.RESET.toString());
-
-        return str;
-    }
-
-    /**
-     * Returns whether an entity should be removed for the halt activity mode.
-     *
-     * @param entity
-     * @return true if it's to be removed
-     */
-    public static boolean isIntensiveEntity(Entity entity) {
-        return entity instanceof Item
-                || entity instanceof TNTPrimed
-                || entity instanceof ExperienceOrb
-                || entity instanceof FallingBlock
-                || (entity instanceof LivingEntity
-                    && !(entity instanceof Tameable)
-                    && !(entity instanceof Player));
-    }
-
-    /**
-     * Search an enum for a value, and return the first one found. Return null if the
-     * enum entry is not found.
-     *
-     * @param enumType enum class
-     * @param values values to test
-     * @return a value in the enum or null
-     */
-    public static <T extends Enum<T>> T tryEnum(Class<T> enumType, String ... values) {
-        for (String val : values) {
-            try {
-                return Enum.valueOf(enumType, val);
-            } catch (IllegalArgumentException e) {
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get a blacklist target for the given block.
-     *
-     * @param block the block
-     * @return a target
-     */
-    public static Target createTarget(Block block) {
-        checkNotNull(block);
-        return new MaterialTarget(block.getTypeId(), block.getData());
-    }
-
-    /**
-     * Get a blacklist target for the given block.
-     *
-     * @param block the block
-     * @param material a fallback material
-     * @return a target
-     */
-    public static Target createTarget(Block block, Material material) {
-        checkNotNull(material);
-        if (block.getType() == material) {
-            return new MaterialTarget(block.getTypeId(), block.getData());
-        } else {
-            return new MaterialTarget(material.getId(), (short) 0);
-        }
-    }
-
-    /**
-     * Get a blacklist target for the given item.
-     *
-     * @param item the item
-     * @return a target
-     */
-    public static Target createTarget(ItemStack item) {
-        checkNotNull(item);
-        return new MaterialTarget(item.getTypeId(), item.getDurability());
-    }
-
-    /**
-     * Get a blacklist target for the given material.
-     *
-     * @param material the material
-     * @return a target
-     */
-    public static Target createTarget(Material material) {
-        checkNotNull(material);
-        return new MaterialTarget(material.getId(), (short) 0);
-    }
-
-    /**
-     * Get a collection of the currently online players.
-     *
-     * @return The online players
-     */
-    @SuppressWarnings("unchecked")
-    public static Collection<? extends Player> getOnlinePlayers() {
-        try {
-            return Bukkit.getServer().getOnlinePlayers();
-        } catch (NoSuchMethodError ignored) {
-        }
-
-        try {
-            if (ONLINE_PLAYERS_METHOD == null) {
-                ONLINE_PLAYERS_METHOD = getOnlinePlayersMethod();
-            }
-
-            Object result = ONLINE_PLAYERS_METHOD.invoke(Bukkit.getServer());
-            if (result instanceof Player[]) {
-                return ImmutableList.copyOf((Player[]) result);
-            } else if (result instanceof Collection<?>) {
-                return (Collection<? extends Player>) result;
-            } else {
-                throw new RuntimeException("Result of getOnlinePlayers() call was not a known data type");
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("WorldGuard is not compatible with this version of Bukkit", e);
-        }
-    }
-
-    private static Method getOnlinePlayersMethod() throws NoSuchMethodException {
-        try {
-            return Server.class.getMethod("getOnlinePlayers");
-        } catch (NoSuchMethodException e1) {
-            return Server.class.getMethod("_INVALID_getOnlinePlayers");
-        }
-    }
-
-}
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.bukkit;
+
+import com.google.common.collect.ImmutableList;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.blocks.BlockType;
+import com.sk89q.worldedit.blocks.ItemID;
+import com.sk89q.worldguard.blacklist.target.MaterialTarget;
+import com.sk89q.worldguard.blacklist.target.Target;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.util.Enums;
+import org.bukkit.*;
+import org.bukkit.block.Block;
+import org.bukkit.entity.*;
+import org.bukkit.inventory.ItemStack;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class BukkitUtil {
+
+    private static Method ONLINE_PLAYERS_METHOD;
+
+    private BukkitUtil()  {
+
+    }
+
+    /**
+     * Converts the location of a Bukkit block to a WorldEdit vector.
+     *
+     * @param block The block to convert
+     * @return The block's location as a BlockVector
+     */
+    public static BlockVector toVector(Block block) {
+        return new BlockVector(block.getX(), block.getY(), block.getZ());
+    }
+
+    /**
+     * Converts a Bukkit location to a WorldEdit vector.
+     *
+     * @param loc A Bukkit Location
+     * @return A Vector with the location's x, y, and z values
+     */
+    public static Vector toVector(Location loc) {
+        return new Vector(loc.getX(), loc.getY(), loc.getZ());
+    }
+
+    /**
+     * Converts a Bukkit vector to a WorldEdit vector.
+     *
+     * @param vector The Bukkit vector
+     * @return A WorldEdit vector with the same values as the Bukkit vector.
+     */
+    public static Vector toVector(org.bukkit.util.Vector vector) {
+        return new Vector(vector.getX(), vector.getY(), vector.getZ());
+    }
+
+    /**
+     * Converts a WorldEdit vector to a Bukkit location.
+     *
+     * @param world The World to create the new Location with
+     * @param vec The vector to use for coordinates
+     * @return The Vector as a location with a World of world
+     */
+    public static Location toLocation(World world, Vector vec) {
+        return new Location(world, vec.getX(), vec.getY(), vec.getZ());
+    }
+
+    /**
+     * Create a dummy region that encompasses the size of a chunk.
+     *
+     * @param chunk The chunk
+     * @return The dummy region
+     */
+    public static ProtectedRegion toRegion(Chunk chunk) {
+        World world = chunk.getWorld();
+
+        int minX = chunk.getX() << 4;
+        int minZ = chunk.getZ() << 4;
+        return new ProtectedCuboidRegion("_", new BlockVector(minX, 0, minZ), new BlockVector(minX + 15, world.getMaxHeight(), minZ + 15));
+    }
+
+    /**
+     * Matches one player based on name.
+     *
+     * @param server The server to check
+     * @param name The name to attempt to match
+     * @deprecated see {@link WorldGuardPlugin#matchSinglePlayer(org.bukkit.command.CommandSender, String)}
+     * @return The matched player if any, otherwise null
+     */
+    @Deprecated
+    public static Player matchSinglePlayer(Server server, String name) {
+        List<Player> players = server.matchPlayer(name);
+        if (players.size() == 0) {
+            return null;
+        }
+        return players.get(0);
+    }
+
+    /**
+     * Drops a sign item and removes a sign.
+     *
+     * @param block The block
+     * @deprecated see {@link org.bukkit.block.Block#breakNaturally()}
+     */
+    @Deprecated
+    public static void dropSign(Block block) {
+        block.setTypeId(0);
+        block.getWorld().dropItemNaturally(block.getLocation(),
+                new ItemStack(ItemID.SIGN, 1));
+    }
+
+    /**
+     * Sets the given block to fluid water.
+     * Used by addSpongeWater()
+     *
+     * @param world
+     * @param ox
+     * @param oy
+     * @param oz
+     */
+    public static void setBlockToWater(World world, int ox, int oy, int oz) {
+        Block block = world.getBlockAt(ox, oy, oz);
+        int id = block.getTypeId();
+        if (id == 0) {
+            block.setTypeId(8);
+        }
+    }
+
+    /**
+     * Checks if the given block is water
+     *
+     * @param world the world
+     * @param ox x
+     * @param oy y
+     * @param oz z
+     * @return true if it's water
+     */
+    public static boolean isBlockWater(World world, int ox, int oy, int oz) {
+        Block block = world.getBlockAt(ox, oy, oz);
+        int id = block.getTypeId();
+        return id == 8 || id == 9;
+    }
+
+    /**
+     * Checks if the given potion is a vial of water.
+     *
+     * @param item the item to check
+     * @return true if it's a water vial
+     */
+    public static boolean isWaterPotion(ItemStack item) {
+        return (item.getDurability() & 0x3F) == 0;
+    }
+
+    /**
+     * Get just the potion effect bits. This is to work around bugs with potion
+     * parsing.
+     *
+     * @param item item
+     * @return new bits
+     */
+    public static int getPotionEffectBits(ItemStack item) {
+        return item.getDurability() & 0x3F;
+    }
+
+    /**
+     * Find a position for the player to stand that is not inside a block.
+     * Blocks above the player will be iteratively tested until there is
+     * a series of two free blocks. The player will be teleported to
+     * that free position.
+     *
+     * @param player
+     */
+    public static void findFreePosition(Player player) {
+        Location loc = player.getLocation();
+        int x = loc.getBlockX();
+        int y = Math.max(0, loc.getBlockY());
+        int origY = y;
+        int z = loc.getBlockZ();
+        World world = player.getWorld();
+
+        byte free = 0;
+
+        while (y <= world.getMaxHeight() + 1) {
+            if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) {
+                free++;
+            } else {
+                free = 0;
+            }
+
+            if (free == 2) {
+                if (y - 1 != origY || y == 1) {
+                    loc.setX(x + 0.5);
+                    loc.setY(y);
+                    loc.setZ(z + 0.5);
+                    if (y <= 2 && world.getBlockAt(x,0,z).getTypeId() == BlockID.AIR) {
+                        world.getBlockAt(x,0,z).setTypeId(20);
+                        loc.setY(2);
+                    }
+                    player.setFallDistance(0F);
+                    player.teleport(loc);
+                }
+                return;
+            }
+
+            y++;
+        }
+    }
+
+    /**
+     * Replace color macros in a string. The macros are in the form of `[char]
+     * where char represents the color. R is for red, Y is for yellow,
+     * G is for green, C is for cyan, B is for blue, and P is for purple.
+     * The uppercase versions of those are the darker shades, while the
+     * lowercase versions are the lighter shades. For white, it's 'w', and
+     * 0-2 are black, dark grey, and grey, respectively.
+     *
+     * @param str
+     * @return color-coded string
+     */
+    public static String replaceColorMacros(String str) {
+        str = str.replace("&r", ChatColor.RED.toString());
+        str = str.replace("&R", ChatColor.DARK_RED.toString());
+
+        str = str.replace("&y", ChatColor.YELLOW.toString());
+        str = str.replace("&Y", ChatColor.GOLD.toString());
+
+        str = str.replace("&g", ChatColor.GREEN.toString());
+        str = str.replace("&G", ChatColor.DARK_GREEN.toString());
+
+        str = str.replace("&c", ChatColor.AQUA.toString());
+        str = str.replace("&C", ChatColor.DARK_AQUA.toString());
+
+        str = str.replace("&b", ChatColor.BLUE.toString());
+        str = str.replace("&B", ChatColor.DARK_BLUE.toString());
+
+        str = str.replace("&p", ChatColor.LIGHT_PURPLE.toString());
+        str = str.replace("&P", ChatColor.DARK_PURPLE.toString());
+
+        str = str.replace("&0", ChatColor.BLACK.toString());
+        str = str.replace("&1", ChatColor.DARK_GRAY.toString());
+        str = str.replace("&2", ChatColor.GRAY.toString());
+        str = str.replace("&w", ChatColor.WHITE.toString());
+
+        str = str.replace("&k", ChatColor.MAGIC.toString());
+        str = str.replace("&l", ChatColor.BOLD.toString());
+        str = str.replace("&m", ChatColor.STRIKETHROUGH.toString());
+        str = str.replace("&n", ChatColor.UNDERLINE.toString());
+        str = str.replace("&o", ChatColor.ITALIC.toString());
+
+        str = str.replace("&x", ChatColor.RESET.toString());
+
+        return str;
+    }
+
+    private static final org.bukkit.entity.EntityType armorStandType =
+        Enums.findByValue(org.bukkit.entity.EntityType.class, "ARMOR_STAND");
+
+    /**
+     * Returns whether an entity should be removed for the halt activity mode.
+     *
+     * @param entity
+     * @return true if it's to be removed
+     */
+    public static boolean isIntensiveEntity(Entity entity) {
+        return entity instanceof Item
+                || entity instanceof TNTPrimed
+                || entity instanceof ExperienceOrb
+                || entity instanceof FallingBlock
+                || (entity instanceof LivingEntity
+                    && !(entity instanceof Tameable)
+                    && !(entity instanceof Player)
+                    && !(entity.getType() == armorStandType));
+    }
+
+    /**
+     * Search an enum for a value, and return the first one found. Return null if the
+     * enum entry is not found.
+     *
+     * @param enumType enum class
+     * @param values values to test
+     * @return a value in the enum or null
+     * @deprecated use {@link Enums#findByValue(Class, String...)}
+     */
+    @Deprecated
+    public static <T extends Enum<T>> T tryEnum(Class<T> enumType, String ... values) {
+        for (String val : values) {
+            try {
+                return Enum.valueOf(enumType, val);
+            } catch (IllegalArgumentException e) {
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a blacklist target for the given block.
+     *
+     * @param block the block
+     * @return a target
+     */
+    public static Target createTarget(Block block) {
+        checkNotNull(block);
+        return new MaterialTarget(block.getTypeId(), block.getData());
+    }
+
+    /**
+     * Get a blacklist target for the given block.
+     *
+     * @param block the block
+     * @param material a fallback material
+     * @return a target
+     */
+    public static Target createTarget(Block block, Material material) {
+        checkNotNull(material);
+        if (block.getType() == material) {
+            return new MaterialTarget(block.getTypeId(), block.getData());
+        } else {
+            return new MaterialTarget(material.getId(), (short) 0);
+        }
+    }
+
+    /**
+     * Get a blacklist target for the given item.
+     *
+     * @param item the item
+     * @return a target
+     */
+    public static Target createTarget(ItemStack item) {
+        checkNotNull(item);
+        return new MaterialTarget(item.getTypeId(), item.getDurability());
+    }
+
+    /**
+     * Get a blacklist target for the given material.
+     *
+     * @param material the material
+     * @return a target
+     */
+    public static Target createTarget(Material material) {
+        checkNotNull(material);
+        return new MaterialTarget(material.getId(), (short) 0);
+    }
+
+    /**
+     * Get a collection of the currently online players.
+     *
+     * @return The online players
+     */
+    @SuppressWarnings("unchecked")
+    public static Collection<? extends Player> getOnlinePlayers() {
+        try {
+            return Bukkit.getServer().getOnlinePlayers();
+        } catch (NoSuchMethodError ignored) {
+        }
+
+        try {
+            if (ONLINE_PLAYERS_METHOD == null) {
+                ONLINE_PLAYERS_METHOD = getOnlinePlayersMethod();
+            }
+
+            Object result = ONLINE_PLAYERS_METHOD.invoke(Bukkit.getServer());
+            if (result instanceof Player[]) {
+                return ImmutableList.copyOf((Player[]) result);
+            } else if (result instanceof Collection<?>) {
+                return (Collection<? extends Player>) result;
+            } else {
+                throw new RuntimeException("Result of getOnlinePlayers() call was not a known data type");
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("WorldGuard is not compatible with this version of Bukkit", e);
+        }
+    }
+
+    private static Method getOnlinePlayersMethod() throws NoSuchMethodException {
+        try {
+            return Server.class.getMethod("getOnlinePlayers");
+        } catch (NoSuchMethodException e1) {
+            return Server.class.getMethod("_INVALID_getOnlinePlayers");
+        }
+    }
+
+}

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

@@ -91,6 +91,7 @@ public class ConfigurationManager {
     public boolean keepUnresolvedNames;
 
     @Unreported public Map<String, String> hostKeys = new HashMap<String, String>();
+    public boolean hostKeysAllowFMLClients;
 
     /**
      * Region Storage Configuration method, and config values
@@ -169,6 +170,7 @@ public class ConfigurationManager {
                 hostKeys.put(key.toLowerCase(), value);
             }
         }
+        hostKeysAllowFMLClients = config.getBoolean("security.host-keys-allow-forge-clients", false);
 
         // ====================================================================
         // Region store drivers

worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/RegionContainer.java

@@ -85,7 +85,7 @@ public class RegionContainer {
      */
     void initialize() {
         ConfigurationManager config = plugin.getGlobalStateManager();
-        container = new RegionContainerImpl(config.selectedRegionStoreDriver);
+        container = new RegionContainerImpl(config.selectedRegionStoreDriver, plugin.getFlagRegistry());
 
         // Migrate to UUIDs
         autoMigrate();
@@ -293,7 +293,7 @@ public class RegionContainer {
 
         if (config.migrateRegionsToUuid) {
             RegionDriver driver = getDriver();
-            UUIDMigration migrator = new UUIDMigration(driver, plugin.getProfileService());
+            UUIDMigration migrator = new UUIDMigration(driver, plugin.getProfileService(), plugin.getFlagRegistry());
             migrator.setKeepUnresolvedNames(config.keepUnresolvedNames);
             try {
                 migrate(migrator);

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

@@ -118,6 +118,7 @@ public class WorldConfiguration {
     public boolean blockOtherExplosions;
     public boolean blockEntityPaintingDestroy;
     public boolean blockEntityItemFrameDestroy;
+    public boolean blockEntityArmorStandDestroy;
     public boolean blockPluginSpawning;
     public boolean blockGroundSlimes;
     public boolean blockZombieDoorDestruction;
@@ -145,6 +146,7 @@ public class WorldConfiguration {
     public int maxClaimVolume;
     public boolean claimOnlyInsideExistingRegions;
     public int maxRegionCountPerPlayer;
+    public boolean boundedLocationFlags;
     public boolean antiWolfDumbness;
     public boolean signChestProtection;
     public boolean disableSignChestProtectionCheck;
@@ -174,14 +176,15 @@ public class WorldConfiguration {
     public boolean disableSoilDehydration;
     public Set<Integer> allowedSnowFallOver;
     public boolean regionInvinciblityRemovesMobs;
+    public boolean regionNetherPortalProtection;
     public boolean fakePlayerBuildOverride;
     public boolean explosionFlagCancellation;
     public boolean disableDeathMessages;
     public boolean disableObsidianGenerators;
     public boolean strictEntitySpawn;
     public TargetMatcherSet allowAllInteract;
-    public TargetMatcherSet blockUseAtFeet;
 
+    public TargetMatcherSet blockUseAtFeet;
     private Map<String, Integer> maxRegionCounts;
 
     /* Configuration data end */
@@ -405,6 +408,7 @@ public class WorldConfiguration {
         disableSnowmanTrails = getBoolean("mobs.disable-snowman-trails", false);
         blockEntityPaintingDestroy = getBoolean("mobs.block-painting-destroy", false);
         blockEntityItemFrameDestroy = getBoolean("mobs.block-item-frame-destroy", false);
+        blockEntityArmorStandDestroy = getBoolean("mobs.block-armor-stand-destroy", false);
         blockPluginSpawning = getBoolean("mobs.block-plugin-spawning", true);
         blockGroundSlimes = getBoolean("mobs.block-above-ground-slimes", false);
         blockOtherExplosions = getBoolean("mobs.block-other-explosions", false);
@@ -453,6 +457,7 @@ public class WorldConfiguration {
 
         useRegions = getBoolean("regions.enable", true);
         regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
+        regionNetherPortalProtection = getBoolean("regions.nether-portal-protection", false);
         fakePlayerBuildOverride = getBoolean("regions.fake-player-build-override", true);
         explosionFlagCancellation = getBoolean("regions.explosion-flags-block-entity-damage", true);
         highFreqFlags = getBoolean("regions.high-frequency-flags", false);
@@ -460,6 +465,7 @@ public class WorldConfiguration {
         regionWand = getInt("regions.wand", 334);
         maxClaimVolume = getInt("regions.max-claim-volume", 30000);
         claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false);
+        boundedLocationFlags = getBoolean("regions.location-flags-only-inside-regions", false);
 
         maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player.default", 7);
         maxRegionCounts = new HashMap<String, Integer>();

worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/FutureProgressListener.java

@@ -49,7 +49,7 @@ public class FutureProgressListener implements Runnable {
     }
 
     public static void addProgressListener(ListenableFuture<?> future, CommandSender sender, String message) {
-        future.addListener(new FutureProgressListener(sender, message), MoreExecutors.sameThreadExecutor());
+        future.addListener(new FutureProgressListener(sender, message), MoreExecutors.directExecutor());
     }
 
 }

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

@@ -1,311 +1,313 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.bukkit.commands;
-
-import com.sk89q.minecraft.util.commands.Command;
-import com.sk89q.minecraft.util.commands.CommandContext;
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.session.Session;
-import com.sk89q.worldguard.session.handler.GodMode;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-public class GeneralCommands {
-    private final WorldGuardPlugin plugin;
-
-    public GeneralCommands(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-    
-    @SuppressWarnings("deprecation")
-    @Command(aliases = {"god"}, usage = "[player]",
-            desc = "Enable godmode on a player", flags = "s", max = 1)
-    public void god(CommandContext args, CommandSender sender) throws CommandException {
-        ConfigurationManager config = plugin.getGlobalStateManager();
-        
-        Iterable<? extends Player> targets = null;
-        boolean included = false;
-        
-        // Detect arguments based on the number of arguments provided
-        if (args.argsLength() == 0) {
-            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god");
-        } else {
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god.other");
-        }
-
-        for (Player player : targets) {
-            Session session = plugin.getSessionManager().get(player);
-
-            if (GodMode.set(player, session, true)) {
-                player.setFireTicks(0);
-
-                // Tell the user
-                if (player.equals(sender)) {
-                    player.sendMessage(ChatColor.YELLOW + "God mode enabled! Use /ungod to disable.");
-
-                    // Keep track of this
-                    included = true;
-                } else {
-                    player.sendMessage(ChatColor.YELLOW + "God enabled by "
-                            + plugin.toName(sender) + ".");
-
-                }
-            }
-        }
-        
-        // The player didn't receive any items, then we need to send the
-        // user a message so s/he know that something is indeed working
-        if (!included && args.hasFlag('s')) {
-            sender.sendMessage(ChatColor.YELLOW + "Players now have god mode.");
-        }
-    }
-    
-    @SuppressWarnings("deprecation")
-    @Command(aliases = {"ungod"}, usage = "[player]",
-            desc = "Disable godmode on a player", flags = "s", max = 1)
-    public void ungod(CommandContext args, CommandSender sender) throws CommandException {
-        ConfigurationManager config = plugin.getGlobalStateManager();
-        
-        Iterable<? extends Player> targets = null;
-        boolean included = false;
-        
-        // Detect arguments based on the number of arguments provided
-        if (args.argsLength() == 0) {
-            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god");
-        } else {
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god.other");
-        }
-
-        for (Player player : targets) {
-            Session session = plugin.getSessionManager().get(player);
-
-            if (GodMode.set(player, session, false)) {
-                // Tell the user
-                if (player.equals(sender)) {
-                    player.sendMessage(ChatColor.YELLOW + "God mode disabled!");
-
-                    // Keep track of this
-                    included = true;
-                } else {
-                    player.sendMessage(ChatColor.YELLOW + "God disabled by "
-                            + plugin.toName(sender) + ".");
-
-                }
-            }
-        }
-        
-        // The player didn't receive any items, then we need to send the
-        // user a message so s/he know that something is indeed working
-        if (!included && args.hasFlag('s')) {
-            sender.sendMessage(ChatColor.YELLOW + "Players no longer have god mode.");
-        }
-    }
-    
-    @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1)
-    public void heal(CommandContext args,CommandSender sender) throws CommandException {
-
-        Iterable<? extends Player> targets = null;
-        boolean included = false;
-        
-        // Detect arguments based on the number of arguments provided
-        if (args.argsLength() == 0) {
-            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.heal");
-        } else if (args.argsLength() == 1) {            
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.heal.other");
-        }
-
-        for (Player player : targets) {
-            player.setHealth(player.getMaxHealth());
-            player.setFoodLevel(20);
-            
-            // Tell the user
-            if (player.equals(sender)) {
-                player.sendMessage(ChatColor.YELLOW + "Healed!");
-                
-                // Keep track of this
-                included = true;
-            } else {
-                player.sendMessage(ChatColor.YELLOW + "Healed by "
-                        + plugin.toName(sender) + ".");
-                
-            }
-        }
-        
-        // The player didn't receive any items, then we need to send the
-        // user a message so s/he know that something is indeed working
-        if (!included && args.hasFlag('s')) {
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Players healed.");
-        }
-    }
-    
-    @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1)
-    public void slay(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Iterable<? extends Player> targets = null;
-        boolean included = false;
-        
-        // Detect arguments based on the number of arguments provided
-        if (args.argsLength() == 0) {
-            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.slay");
-        } else if (args.argsLength() == 1) {            
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.slay.other");
-        }
-
-        for (Player player : targets) {
-            player.setHealth(0);
-            
-            // Tell the user
-            if (player.equals(sender)) {
-                player.sendMessage(ChatColor.YELLOW + "Slain!");
-                
-                // Keep track of this
-                included = true;
-            } else {
-                player.sendMessage(ChatColor.YELLOW + "Slain by "
-                        + plugin.toName(sender) + ".");
-                
-            }
-        }
-        
-        // The player didn't receive any items, then we need to send the
-        // user a message so s/he know that something is indeed working
-        if (!included && args.hasFlag('s')) {
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Players slain.");
-        }
-    }
-    
-    @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1)
-    @CommandPermissions({"worldguard.locate"})
-    public void locate(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        
-        if (args.argsLength() == 0) {
-            player.setCompassTarget(player.getWorld().getSpawnLocation());
-            
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Compass reset to spawn.");
-        } else {
-            Player target = plugin.matchSinglePlayer(sender, args.getString(0));
-            player.setCompassTarget(target.getLocation());
-            
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Compass repointed.");
-        }
-    }
-    
-    @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0)
-    @CommandPermissions({"worldguard.stack"})
-    public void stack(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        boolean ignoreMax = plugin.hasPermission(player, "worldguard.stack.illegitimate");
-        boolean ignoreDamaged = plugin.hasPermission(player, "worldguard.stack.damaged");
-        
-        ItemStack[] items = player.getInventory().getContents();
-        int len = items.length;
-
-        int affected = 0;
-        
-        for (int i = 0; i < len; i++) {
-            ItemStack item = items[i];
-
-            // Avoid infinite stacks and stacks with durability
-            if (item == null || item.getAmount() <= 0
-                    || (!ignoreMax && item.getMaxStackSize() == 1)) {
-                continue;
-            }
-
-            int max = ignoreMax ? 64 : item.getMaxStackSize();
-
-            if (item.getAmount() < max) {
-                int needed = max - item.getAmount(); // Number of needed items until max
-
-                // Find another stack of the same type
-                for (int j = i + 1; j < len; j++) {
-                    ItemStack item2 = items[j];
-
-                    // Avoid infinite stacks and stacks with durability
-                    if (item2 == null || item2.getAmount() <= 0
-                            || (!ignoreMax && item.getMaxStackSize() == 1)) {
-                        continue;
-                    }
-
-                    // Same type?
-                    // Blocks store their color in the damage value
-                    if (item2.getTypeId() == item.getTypeId() &&
-                            ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged)
-                                    || item.getDurability() == item2.getDurability()) &&
-                                    ((item.getItemMeta() == null && item2.getItemMeta() == null)
-                                            || (item.getItemMeta() != null &&
-                                                item.getItemMeta().equals(item2.getItemMeta())))) {
-                        // This stack won't fit in the parent stack
-                        if (item2.getAmount() > needed) {
-                            item.setAmount(max);
-                            item2.setAmount(item2.getAmount() - needed);
-                            break;
-                        // This stack will
-                        } else {
-                            items[j] = null;
-                            item.setAmount(item.getAmount() + item2.getAmount());
-                            needed = max - item.getAmount();
-                        }
-
-                        affected++;
-                    }
-                }
-            }
-        }
-
-        if (affected > 0) {
-            player.getInventory().setContents(items);
-        }
-
-        player.sendMessage(ChatColor.YELLOW + "Items compacted into stacks!");
-    }
-}
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.bukkit.commands;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldedit.blocks.ItemType;
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.session.Session;
+import com.sk89q.worldguard.session.handler.GodMode;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+public class GeneralCommands {
+    private final WorldGuardPlugin plugin;
+
+    public GeneralCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+    
+    @SuppressWarnings("deprecation")
+    @Command(aliases = {"god"}, usage = "[player]",
+            desc = "Enable godmode on a player", flags = "s", max = 1)
+    public void god(CommandContext args, CommandSender sender) throws CommandException {
+        ConfigurationManager config = plugin.getGlobalStateManager();
+        
+        Iterable<? extends Player> targets = null;
+        boolean included = false;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god");
+        } else {
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god.other");
+        }
+
+        for (Player player : targets) {
+            Session session = plugin.getSessionManager().get(player);
+
+            if (GodMode.set(player, session, true)) {
+                player.setFireTicks(0);
+
+                // Tell the user
+                if (player.equals(sender)) {
+                    player.sendMessage(ChatColor.YELLOW + "God mode enabled! Use /ungod to disable.");
+
+                    // Keep track of this
+                    included = true;
+                } else {
+                    player.sendMessage(ChatColor.YELLOW + "God enabled by "
+                            + plugin.toName(sender) + ".");
+
+                }
+            }
+        }
+        
+        // The player didn't receive any items, then we need to send the
+        // user a message so s/he know that something is indeed working
+        if (!included && args.hasFlag('s')) {
+            sender.sendMessage(ChatColor.YELLOW + "Players now have god mode.");
+        }
+    }
+    
+    @SuppressWarnings("deprecation")
+    @Command(aliases = {"ungod"}, usage = "[player]",
+            desc = "Disable godmode on a player", flags = "s", max = 1)
+    public void ungod(CommandContext args, CommandSender sender) throws CommandException {
+        ConfigurationManager config = plugin.getGlobalStateManager();
+        
+        Iterable<? extends Player> targets = null;
+        boolean included = false;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god");
+        } else {
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god.other");
+        }
+
+        for (Player player : targets) {
+            Session session = plugin.getSessionManager().get(player);
+
+            if (GodMode.set(player, session, false)) {
+                // Tell the user
+                if (player.equals(sender)) {
+                    player.sendMessage(ChatColor.YELLOW + "God mode disabled!");
+
+                    // Keep track of this
+                    included = true;
+                } else {
+                    player.sendMessage(ChatColor.YELLOW + "God disabled by "
+                            + plugin.toName(sender) + ".");
+
+                }
+            }
+        }
+        
+        // The player didn't receive any items, then we need to send the
+        // user a message so s/he know that something is indeed working
+        if (!included && args.hasFlag('s')) {
+            sender.sendMessage(ChatColor.YELLOW + "Players no longer have god mode.");
+        }
+    }
+    
+    @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1)
+    public void heal(CommandContext args,CommandSender sender) throws CommandException {
+
+        Iterable<? extends Player> targets = null;
+        boolean included = false;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.heal");
+        } else if (args.argsLength() == 1) {            
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.heal.other");
+        }
+
+        for (Player player : targets) {
+            player.setHealth(player.getMaxHealth());
+            player.setFoodLevel(20);
+            player.setSaturation(20);
+            player.setExhaustion(0);
+            
+            // Tell the user
+            if (player.equals(sender)) {
+                player.sendMessage(ChatColor.YELLOW + "Healed!");
+                
+                // Keep track of this
+                included = true;
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "Healed by "
+                        + plugin.toName(sender) + ".");
+                
+            }
+        }
+        
+        // The player didn't receive any items, then we need to send the
+        // user a message so s/he know that something is indeed working
+        if (!included && args.hasFlag('s')) {
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Players healed.");
+        }
+    }
+    
+    @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1)
+    public void slay(CommandContext args, CommandSender sender) throws CommandException {
+        
+        Iterable<? extends Player> targets = null;
+        boolean included = false;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.slay");
+        } else if (args.argsLength() == 1) {            
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.slay.other");
+        }
+
+        for (Player player : targets) {
+            player.setHealth(0);
+            
+            // Tell the user
+            if (player.equals(sender)) {
+                player.sendMessage(ChatColor.YELLOW + "Slain!");
+                
+                // Keep track of this
+                included = true;
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "Slain by "
+                        + plugin.toName(sender) + ".");
+                
+            }
+        }
+        
+        // The player didn't receive any items, then we need to send the
+        // user a message so s/he know that something is indeed working
+        if (!included && args.hasFlag('s')) {
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Players slain.");
+        }
+    }
+    
+    @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1)
+    @CommandPermissions({"worldguard.locate"})
+    public void locate(CommandContext args, CommandSender sender) throws CommandException {
+        
+        Player player = plugin.checkPlayer(sender);
+        
+        if (args.argsLength() == 0) {
+            player.setCompassTarget(player.getWorld().getSpawnLocation());
+            
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Compass reset to spawn.");
+        } else {
+            Player target = plugin.matchSinglePlayer(sender, args.getString(0));
+            player.setCompassTarget(target.getLocation());
+            
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Compass repointed.");
+        }
+    }
+    
+    @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0)
+    @CommandPermissions({"worldguard.stack"})
+    public void stack(CommandContext args, CommandSender sender) throws CommandException {
+        
+        Player player = plugin.checkPlayer(sender);
+        boolean ignoreMax = plugin.hasPermission(player, "worldguard.stack.illegitimate");
+        boolean ignoreDamaged = plugin.hasPermission(player, "worldguard.stack.damaged");
+        
+        ItemStack[] items = player.getInventory().getContents();
+        int len = items.length;
+
+        int affected = 0;
+        
+        for (int i = 0; i < len; i++) {
+            ItemStack item = items[i];
+
+            // Avoid infinite stacks and stacks with durability
+            if (item == null || item.getAmount() <= 0
+                    || (!ignoreMax && item.getMaxStackSize() == 1)) {
+                continue;
+            }
+
+            int max = ignoreMax ? 64 : item.getMaxStackSize();
+
+            if (item.getAmount() < max) {
+                int needed = max - item.getAmount(); // Number of needed items until max
+
+                // Find another stack of the same type
+                for (int j = i + 1; j < len; j++) {
+                    ItemStack item2 = items[j];
+
+                    // Avoid infinite stacks and stacks with durability
+                    if (item2 == null || item2.getAmount() <= 0
+                            || (!ignoreMax && item.getMaxStackSize() == 1)) {
+                        continue;
+                    }
+
+                    // Same type?
+                    // Blocks store their color in the damage value
+                    if (item2.getTypeId() == item.getTypeId() &&
+                            ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged)
+                                    || item.getDurability() == item2.getDurability()) &&
+                                    ((item.getItemMeta() == null && item2.getItemMeta() == null)
+                                            || (item.getItemMeta() != null &&
+                                                item.getItemMeta().equals(item2.getItemMeta())))) {
+                        // This stack won't fit in the parent stack
+                        if (item2.getAmount() > needed) {
+                            item.setAmount(max);
+                            item2.setAmount(item2.getAmount() - needed);
+                            break;
+                        // This stack will
+                        } else {
+                            items[j] = null;
+                            item.setAmount(item.getAmount() + item2.getAmount());
+                            needed = max - item.getAmount();
+                        }
+
+                        affected++;
+                    }
+                }
+            }
+        }
+
+        if (affected > 0) {
+            player.getInventory().setContents(items);
+        }
+
+        player.sendMessage(ChatColor.YELLOW + "Items compacted into stacks!");
+    }
+}

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

@@ -1,46 +1,46 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.bukkit.commands;
-
-import com.sk89q.worldguard.bukkit.commands.region.MemberCommands;
-import com.sk89q.worldguard.bukkit.commands.region.RegionCommands;
-import org.bukkit.command.CommandSender;
-
-import com.sk89q.minecraft.util.commands.Command;
-import com.sk89q.minecraft.util.commands.CommandContext;
-import com.sk89q.minecraft.util.commands.NestedCommand;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-
-public class ProtectionCommands {
-    @SuppressWarnings("unused")
-    private final WorldGuardPlugin plugin;
-
-    public ProtectionCommands(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Command(aliases = {"region", "regions", "rg"}, desc = "Region management commands")
-    @NestedCommand({RegionCommands.class, MemberCommands.class})
-    public void region(CommandContext args, CommandSender sender) {}
-
-    @Command(aliases = {"worldguard", "wg"}, desc = "WorldGuard commands")
-    @NestedCommand({WorldGuardCommands.class})
-    public void worldGuard(CommandContext args, CommandSender sender) {}
-}
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.bukkit.commands;
+
+import com.sk89q.worldguard.bukkit.commands.region.MemberCommands;
+import com.sk89q.worldguard.bukkit.commands.region.RegionCommands;
+import org.bukkit.command.CommandSender;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.NestedCommand;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+
+public class ProtectionCommands {
+    @SuppressWarnings("unused")
+    private final WorldGuardPlugin plugin;
+
+    public ProtectionCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"region", "regions", "rg"}, desc = "Region management commands")
+    @NestedCommand({RegionCommands.class, MemberCommands.class})
+    public void region(CommandContext args, CommandSender sender) {}
+
+    @Command(aliases = {"worldguard", "wg"}, desc = "WorldGuard commands")
+    @NestedCommand({WorldGuardCommands.class})
+    public void worldGuard(CommandContext args, CommandSender sender) {}
+}

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

@@ -1,165 +1,165 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.bukkit.commands;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import com.sk89q.minecraft.util.commands.Command;
-import com.sk89q.minecraft.util.commands.CommandContext;
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldguard.bukkit.BukkitUtil;
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
-import com.sk89q.worldguard.bukkit.WorldConfiguration;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-
-public class ToggleCommands {
-    private final WorldGuardPlugin plugin;
-
-    public ToggleCommands(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Command(aliases = {"stopfire"}, usage = "[<world>]",
-            desc = "Disables all fire spread temporarily", max = 1)
-    @CommandPermissions({"worldguard.fire-toggle.stop"})
-    public void stopFire(CommandContext args, CommandSender sender) throws CommandException {
-        
-        World world;
-        
-        if (args.argsLength() == 0) {
-            world = plugin.checkPlayer(sender).getWorld();
-        } else {
-            world = plugin.matchWorld(sender, args.getString(0));
-        }
-        
-        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world);
-
-        if (!wcfg.fireSpreadDisableToggle) {
-            plugin.getServer().broadcastMessage(
-                    ChatColor.YELLOW
-                    + "Fire spread has been globally disabled for '" + world.getName() + "' by "
-                    + plugin.toName(sender) + ".");
-        } else {
-            sender.sendMessage(
-                    ChatColor.YELLOW
-                    + "Fire spread was already globally disabled.");
-        }
-
-        wcfg.fireSpreadDisableToggle = true;
-    }
-
-    @Command(aliases = {"allowfire"}, usage = "[<world>]",
-            desc = "Allows all fire spread temporarily", max = 1)
-    @CommandPermissions({"worldguard.fire-toggle.stop"})
-    public void allowFire(CommandContext args, CommandSender sender) throws CommandException {
-        
-        World world;
-        
-        if (args.argsLength() == 0) {
-            world = plugin.checkPlayer(sender).getWorld();
-        } else {
-            world = plugin.matchWorld(sender, args.getString(0));
-        }
-        
-        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world);
-
-        if (wcfg.fireSpreadDisableToggle) {
-            plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                    + "Fire spread has been globally for '" + world.getName() + "' re-enabled by "
-                    + plugin.toName(sender) + ".");
-        } else {
-            sender.sendMessage(ChatColor.YELLOW
-                    + "Fire spread was already globally enabled.");
-        }
-
-        wcfg.fireSpreadDisableToggle = false;
-    }
-
-    @Command(aliases = {"halt-activity", "stoplag", "haltactivity"},
-            desc = "Attempts to cease as much activity in order to stop lag", flags = "cis", max = 0)
-    @CommandPermissions({"worldguard.halt-activity"})
-    public void stopLag(CommandContext args, CommandSender sender) throws CommandException {
-
-        ConfigurationManager configManager = plugin.getGlobalStateManager();
-
-        if (args.hasFlag('i')) {
-            if (configManager.activityHaltToggle) {
-                 sender.sendMessage(ChatColor.YELLOW
-                         + "ALL intensive server activity is not allowed.");
-            } else {
-                 sender.sendMessage(ChatColor.YELLOW
-                         + "ALL intensive server activity is allowed.");
-            }
-        } else {
-            configManager.activityHaltToggle = !args.hasFlag('c');
-
-            if (configManager.activityHaltToggle) {
-                if (!(sender instanceof Player)) {
-                    sender.sendMessage(ChatColor.YELLOW
-                            + "ALL intensive server activity halted.");
-                }
-
-                if (!args.hasFlag('s')) {
-                    plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                             + "ALL intensive server activity halted by "
-                             + plugin.toName(sender) + ".");
-                } else {
-                    sender.sendMessage(ChatColor.YELLOW
-                        + "(Silent) ALL intensive server activity halted by "
-                        + plugin.toName(sender) + ".");
-                }
-
-                for (World world : plugin.getServer().getWorlds()) {
-                    int removed = 0;
-
-                    for (Entity entity : world.getEntities()) {
-                        if (BukkitUtil.isIntensiveEntity(entity)) {
-                            entity.remove();
-                            removed++;
-                        }
-                    }
-
-                    if (removed > 10) {
-                        sender.sendMessage("" + removed + " entities (>10) auto-removed from "
-                                + world.getName());
-                    }
-                }
-            } else {
-                if (!args.hasFlag('s')) {
-                    plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                            + "ALL intensive server activity is now allowed.");
-                    
-                    if (!(sender instanceof Player)) {
-                        sender.sendMessage(ChatColor.YELLOW
-                                + "ALL intensive server activity is now allowed.");
-                    }
-                } else {
-                    sender.sendMessage(ChatColor.YELLOW
-                            + "(Silent) ALL intensive server activity is now allowed.");
-                }
-            }
-        }
-    }
-}
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.bukkit.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldguard.bukkit.BukkitUtil;
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
+import com.sk89q.worldguard.bukkit.WorldConfiguration;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+
+public class ToggleCommands {
+    private final WorldGuardPlugin plugin;
+
+    public ToggleCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"stopfire"}, usage = "[<world>]",
+            desc = "Disables all fire spread temporarily", max = 1)
+    @CommandPermissions({"worldguard.fire-toggle.stop"})
+    public void stopFire(CommandContext args, CommandSender sender) throws CommandException {
+        
+        World world;
+        
+        if (args.argsLength() == 0) {
+            world = plugin.checkPlayer(sender).getWorld();
+        } else {
+            world = plugin.matchWorld(sender, args.getString(0));
+        }
+        
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world);
+
+        if (!wcfg.fireSpreadDisableToggle) {
+            plugin.getServer().broadcastMessage(
+                    ChatColor.YELLOW
+                    + "Fire spread has been globally disabled for '" + world.getName() + "' by "
+                    + plugin.toName(sender) + ".");
+        } else {
+            sender.sendMessage(
+                    ChatColor.YELLOW
+                    + "Fire spread was already globally disabled.");
+        }
+
+        wcfg.fireSpreadDisableToggle = true;
+    }
+
+    @Command(aliases = {"allowfire"}, usage = "[<world>]",
+            desc = "Allows all fire spread temporarily", max = 1)
+    @CommandPermissions({"worldguard.fire-toggle.stop"})
+    public void allowFire(CommandContext args, CommandSender sender) throws CommandException {
+        
+        World world;
+        
+        if (args.argsLength() == 0) {
+            world = plugin.checkPlayer(sender).getWorld();
+        } else {
+            world = plugin.matchWorld(sender, args.getString(0));
+        }
+        
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world);
+
+        if (wcfg.fireSpreadDisableToggle) {
+            plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                    + "Fire spread has been globally for '" + world.getName() + "' re-enabled by "
+                    + plugin.toName(sender) + ".");
+        } else {
+            sender.sendMessage(ChatColor.YELLOW
+                    + "Fire spread was already globally enabled.");
+        }
+
+        wcfg.fireSpreadDisableToggle = false;
+    }
+
+    @Command(aliases = {"halt-activity", "stoplag", "haltactivity"},
+            desc = "Attempts to cease as much activity in order to stop lag", flags = "cis", max = 0)
+    @CommandPermissions({"worldguard.halt-activity"})
+    public void stopLag(CommandContext args, CommandSender sender) throws CommandException {
+
+        ConfigurationManager configManager = plugin.getGlobalStateManager();
+
+        if (args.hasFlag('i')) {
+            if (configManager.activityHaltToggle) {
+                 sender.sendMessage(ChatColor.YELLOW
+                         + "ALL intensive server activity is not allowed.");
+            } else {
+                 sender.sendMessage(ChatColor.YELLOW
+                         + "ALL intensive server activity is allowed.");
+            }
+        } else {
+            configManager.activityHaltToggle = !args.hasFlag('c');
+
+            if (configManager.activityHaltToggle) {
+                if (!(sender instanceof Player)) {
+                    sender.sendMessage(ChatColor.YELLOW
+                            + "ALL intensive server activity halted.");
+                }
+
+                if (!args.hasFlag('s')) {
+                    plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                             + "ALL intensive server activity halted by "
+                             + plugin.toName(sender) + ".");
+                } else {
+                    sender.sendMessage(ChatColor.YELLOW
+                        + "(Silent) ALL intensive server activity halted by "
+                        + plugin.toName(sender) + ".");
+                }
+
+                for (World world : plugin.getServer().getWorlds()) {
+                    int removed = 0;
+
+                    for (Entity entity : world.getEntities()) {
+                        if (BukkitUtil.isIntensiveEntity(entity)) {
+                            entity.remove();
+                            removed++;
+                        }
+                    }
+
+                    if (removed > 10) {
+                        sender.sendMessage("" + removed + " entities (>10) auto-removed from "
+                                + world.getName());
+                    }
+                }
+            } else {
+                if (!args.hasFlag('s')) {
+                    plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                            + "ALL intensive server activity is now allowed.");
+                    
+                    if (!(sender instanceof Player)) {
+                        sender.sendMessage(ChatColor.YELLOW
+                                + "ALL intensive server activity is now allowed.");
+                    }
+                } else {
+                    sender.sendMessage(ChatColor.YELLOW
+                            + "(Silent) ALL intensive server activity is now allowed.");
+                }
+            }
+        }
+    }
+}

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

@@ -1,296 +1,296 @@
-/*
- * WorldGuard, a suite of tools for Minecraft
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.bukkit.commands;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.io.Files;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.sk89q.minecraft.util.commands.*;
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.bukkit.util.logging.LoggerToChatHandler;
-import com.sk89q.worldguard.bukkit.util.report.*;
-import com.sk89q.worldguard.util.profiler.SamplerBuilder;
-import com.sk89q.worldguard.util.profiler.SamplerBuilder.Sampler;
-import com.sk89q.worldguard.util.profiler.ThreadIdFilter;
-import com.sk89q.worldguard.util.profiler.ThreadNameFilter;
-import com.sk89q.worldguard.util.report.ReportList;
-import com.sk89q.worldguard.util.report.SystemInfoReport;
-import com.sk89q.worldguard.util.task.Task;
-import com.sk89q.worldguard.util.task.TaskStateComparator;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import javax.annotation.Nullable;
-import java.io.File;
-import java.io.IOException;
-import java.lang.management.ThreadInfo;
-import java.nio.charset.Charset;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class WorldGuardCommands {
-
-    private static final Logger log = Logger.getLogger(WorldGuardCommands.class.getCanonicalName());
-
-    private final WorldGuardPlugin plugin;
-    @Nullable
-    private Sampler activeSampler;
-
-    public WorldGuardCommands(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Command(aliases = {"version"}, desc = "Get the WorldGuard version", max = 0)
-    public void version(CommandContext args, CommandSender sender) throws CommandException {
-        sender.sendMessage(ChatColor.YELLOW
-                + "WorldGuard " + plugin.getDescription().getVersion());
-        sender.sendMessage(ChatColor.YELLOW
-                + "http://www.sk89q.com");
-    }
-
-    @Command(aliases = {"reload"}, desc = "Reload WorldGuard configuration", max = 0)
-    @CommandPermissions({"worldguard.reload"})
-    public void reload(CommandContext args, CommandSender sender) throws CommandException {
-        // TODO: This is subject to a race condition, but at least other commands are not being processed concurrently
-        List<Task<?>> tasks = plugin.getSupervisor().getTasks();
-        if (!tasks.isEmpty()) {
-            throw new CommandException("There are currently pending tasks. Use /wg running to monitor these tasks first.");
-        }
-        
-        LoggerToChatHandler handler = null;
-        Logger minecraftLogger = null;
-        
-        if (sender instanceof Player) {
-            handler = new LoggerToChatHandler(sender);
-            handler.setLevel(Level.ALL);
-            minecraftLogger = Logger.getLogger("com.sk89q.worldguard");
-            minecraftLogger.addHandler(handler);
-        }
-
-        try {
-            ConfigurationManager config = plugin.getGlobalStateManager();
-            config.unload();
-            config.load();
-            for (World world : Bukkit.getServer().getWorlds()) {
-                config.get(world);
-            }
-            plugin.getRegionContainer().reload();
-            // WGBukkit.cleanCache();
-            sender.sendMessage("WorldGuard configuration reloaded.");
-        } catch (Throwable t) {
-            sender.sendMessage("Error while reloading: "
-                    + t.getMessage());
-        } finally {
-            if (minecraftLogger != null) {
-                minecraftLogger.removeHandler(handler);
-            }
-        }
-    }
-    
-    @Command(aliases = {"report"}, desc = "Writes a report on WorldGuard", flags = "p", max = 0)
-    @CommandPermissions({"worldguard.report"})
-    public void report(CommandContext args, final CommandSender sender) throws CommandException {
-        ReportList report = new ReportList("Report");
-        report.add(new SystemInfoReport());
-        report.add(new ServerReport());
-        report.add(new PluginReport());
-        report.add(new SchedulerReport());
-        report.add(new ServicesReport());
-        report.add(new WorldReport());
-        report.add(new PerformanceReport());
-        report.add(new ConfigReport(plugin));
-        String result = report.toString();
-
-        try {
-            File dest = new File(plugin.getDataFolder(), "report.txt");
-            Files.write(result, dest, Charset.forName("UTF-8"));
-            sender.sendMessage(ChatColor.YELLOW + "WorldGuard report written to " + dest.getAbsolutePath());
-        } catch (IOException e) {
-            throw new CommandException("Failed to write report: " + e.getMessage());
-        }
-        
-        if (args.hasFlag('p')) {
-            plugin.checkPermission(sender, "worldguard.report.pastebin");
-            CommandUtils.pastebin(plugin, sender, result, "WorldGuard report: %s.report");
-        }
-    }
-
-    @Command(aliases = {"profile"}, usage = "[<minutes>]",
-            desc = "Profile the CPU usage of the server", min = 0, max = 1,
-            flags = "t:p")
-    @CommandPermissions("worldguard.profile")
-    public void profile(final CommandContext args, final CommandSender sender) throws CommandException {
-        Predicate<ThreadInfo> threadFilter;
-        String threadName = args.getFlag('t');
-        final boolean pastebin;
-
-        if (args.hasFlag('p')) {
-            plugin.checkPermission(sender, "worldguard.report.pastebin");
-            pastebin = true;
-        } else {
-            pastebin = false;
-        }
-
-        if (threadName == null) {
-            threadFilter = new ThreadIdFilter(Thread.currentThread().getId());
-        } else if (threadName.equals("*")) {
-            threadFilter = Predicates.alwaysTrue();
-        } else {
-            threadFilter = new ThreadNameFilter(threadName);
-        }
-
-        int minutes;
-        if (args.argsLength() == 0) {
-            minutes = 5;
-        } else {
-            minutes = args.getInteger(0);
-            if (minutes < 1) {
-                throw new CommandException("You must run the profile for at least 1 minute.");
-            } else if (minutes > 10) {
-                throw new CommandException("You can profile for, at maximum, 10 minutes.");
-            }
-        }
-
-        Sampler sampler;
-
-        synchronized (this) {
-            if (activeSampler != null) {
-                throw new CommandException("A profile is currently in progress! Please use /wg stopprofile to stop the current profile.");
-            }
-
-            SamplerBuilder builder = new SamplerBuilder();
-            builder.setThreadFilter(threadFilter);
-            builder.setRunTime(minutes, TimeUnit.MINUTES);
-            sampler = activeSampler = builder.start();
-        }
-
-        AsyncCommandHelper.wrap(sampler.getFuture(), plugin, sender)
-                .formatUsing(minutes)
-                .registerWithSupervisor("Running CPU profiler for %d minute(s)...")
-                .sendMessageAfterDelay("(Please wait... profiling for %d minute(s)...)")
-                .thenTellErrorsOnly("CPU profiling failed.");
-
-        sampler.getFuture().addListener(new Runnable() {
-            @Override
-            public void run() {
-                synchronized (WorldGuardCommands.this) {
-                    activeSampler = null;
-                }
-            }
-        }, MoreExecutors.sameThreadExecutor());
-
-        Futures.addCallback(sampler.getFuture(), new FutureCallback<Sampler>() {
-            @Override
-            public void onSuccess(Sampler result) {
-                String output = result.toString();
-
-                try {
-                    File dest = new File(plugin.getDataFolder(), "profile.txt");
-                    Files.write(output, dest, Charset.forName("UTF-8"));
-                    sender.sendMessage(ChatColor.YELLOW + "CPU profiling data written to " + dest.getAbsolutePath());
-                } catch (IOException e) {
-                    sender.sendMessage(ChatColor.RED + "Failed to write CPU profiling data: " + e.getMessage());
-                }
-
-                if (pastebin) {
-                    CommandUtils.pastebin(plugin, sender, output, "Profile result: %s.profile");
-                }
-            }
-
-            @Override
-            public void onFailure(Throwable throwable) {
-            }
-        });
-    }
-
-    @Command(aliases = {"stopprofile"}, usage = "",desc = "Stop a running profile", min = 0, max = 0)
-    @CommandPermissions("worldguard.profile")
-    public void stopProfile(CommandContext args, final CommandSender sender) throws CommandException {
-        synchronized (this) {
-            if (activeSampler == null) {
-                throw new CommandException("No CPU profile is currently running.");
-            }
-
-            activeSampler.cancel();
-            activeSampler = null;
-        }
-
-        sender.sendMessage("The running CPU profile has been stopped.");
-    }
-
-    @Command(aliases = {"flushstates", "clearstates"},
-            usage = "[player]", desc = "Flush the state manager", max = 1)
-    @CommandPermissions("worldguard.flushstates")
-    public void flushStates(CommandContext args, CommandSender sender) throws CommandException {
-        if (args.argsLength() == 0) {
-            plugin.getSessionManager().resetAllStates();
-            sender.sendMessage("Cleared all states.");
-        } else {
-            Player player = plugin.getServer().getPlayer(args.getString(0));
-            if (player != null) {
-                plugin.getSessionManager().resetState(player);
-                sender.sendMessage("Cleared states for player \"" + player.getName() + "\".");
-            }
-        }
-    }
-
-    @Command(aliases = {"running", "queue"}, desc = "List running tasks", max = 0)
-    @CommandPermissions("worldguard.running")
-    public void listRunningTasks(CommandContext args, CommandSender sender) throws CommandException {
-        List<Task<?>> tasks = plugin.getSupervisor().getTasks();
-
-        if (!tasks.isEmpty()) {
-            Collections.sort(tasks, new TaskStateComparator());
-            StringBuilder builder = new StringBuilder();
-            builder.append(ChatColor.GRAY);
-            builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
-            builder.append(" Running tasks ");
-            builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
-            builder.append("\n").append(ChatColor.GRAY).append("Note: Some 'running' tasks may be waiting to be start.");
-            for (Task task : tasks) {
-                builder.append("\n");
-                builder.append(ChatColor.BLUE).append("(").append(task.getState().name()).append(") ");
-                builder.append(ChatColor.YELLOW);
-                builder.append(CommandUtils.getOwnerName(task.getOwner()));
-                builder.append(": ");
-                builder.append(ChatColor.WHITE);
-                builder.append(task.getName());
-            }
-            sender.sendMessage(builder.toString());
-        } else {
-            sender.sendMessage(ChatColor.YELLOW + "There are currently no running tasks.");
-        }
-    }
-
-    @Command(aliases = {"debug"}, desc = "Debugging commands")
-    @NestedCommand({DebuggingCommands.class})
-    public void debug(CommandContext args, CommandSender sender) {}
-
-}
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.bukkit.commands;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.io.Files;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.sk89q.minecraft.util.commands.*;
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.bukkit.util.logging.LoggerToChatHandler;
+import com.sk89q.worldguard.bukkit.util.report.*;
+import com.sk89q.worldguard.util.profiler.SamplerBuilder;
+import com.sk89q.worldguard.util.profiler.SamplerBuilder.Sampler;
+import com.sk89q.worldguard.util.profiler.ThreadIdFilter;
+import com.sk89q.worldguard.util.profiler.ThreadNameFilter;
+import com.sk89q.worldguard.util.report.ReportList;
+import com.sk89q.worldguard.util.report.SystemInfoReport;
+import com.sk89q.worldguard.util.task.Task;
+import com.sk89q.worldguard.util.task.TaskStateComparator;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.lang.management.ThreadInfo;
+import java.nio.charset.Charset;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class WorldGuardCommands {
+
+    private static final Logger log = Logger.getLogger(WorldGuardCommands.class.getCanonicalName());
+
+    private final WorldGuardPlugin plugin;
+    @Nullable
+    private Sampler activeSampler;
+
+    public WorldGuardCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"version"}, desc = "Get the WorldGuard version", max = 0)
+    public void version(CommandContext args, CommandSender sender) throws CommandException {
+        sender.sendMessage(ChatColor.YELLOW
+                + "WorldGuard " + plugin.getDescription().getVersion());
+        sender.sendMessage(ChatColor.YELLOW
+                + "http://www.sk89q.com");
+    }
+
+    @Command(aliases = {"reload"}, desc = "Reload WorldGuard configuration", max = 0)
+    @CommandPermissions({"worldguard.reload"})
+    public void reload(CommandContext args, CommandSender sender) throws CommandException {
+        // TODO: This is subject to a race condition, but at least other commands are not being processed concurrently
+        List<Task<?>> tasks = plugin.getSupervisor().getTasks();
+        if (!tasks.isEmpty()) {
+            throw new CommandException("There are currently pending tasks. Use /wg running to monitor these tasks first.");
+        }
+        
+        LoggerToChatHandler handler = null;
+        Logger minecraftLogger = null;
+        
+        if (sender instanceof Player) {
+            handler = new LoggerToChatHandler(sender);
+            handler.setLevel(Level.ALL);
+            minecraftLogger = Logger.getLogger("com.sk89q.worldguard");
+            minecraftLogger.addHandler(handler);
+        }
+
+        try {
+            ConfigurationManager config = plugin.getGlobalStateManager();
+            config.unload();
+            config.load();
+            for (World world : Bukkit.getServer().getWorlds()) {
+                config.get(world);
+            }
+            plugin.getRegionContainer().reload();
+            // WGBukkit.cleanCache();
+            sender.sendMessage("WorldGuard configuration reloaded.");
+        } catch (Throwable t) {
+            sender.sendMessage("Error while reloading: "
+                    + t.getMessage());
+        } finally {
+            if (minecraftLogger != null) {
+                minecraftLogger.removeHandler(handler);
+            }
+        }
+    }
+    
+    @Command(aliases = {"report"}, desc = "Writes a report on WorldGuard", flags = "p", max = 0)
+    @CommandPermissions({"worldguard.report"})
+    public void report(CommandContext args, final CommandSender sender) throws CommandException {
+        ReportList report = new ReportList("Report");
+        report.add(new SystemInfoReport());
+        report.add(new ServerReport());
+        report.add(new PluginReport());
+        report.add(new SchedulerReport());
+        report.add(new ServicesReport());
+        report.add(new WorldReport());
+        report.add(new PerformanceReport());
+        report.add(new ConfigReport(plugin));
+        String result = report.toString();
+
+        try {
+            File dest = new File(plugin.getDataFolder(), "report.txt");
+            Files.write(result, dest, Charset.forName("UTF-8"));
+            sender.sendMessage(ChatColor.YELLOW + "WorldGuard report written to " + dest.getAbsolutePath());
+        } catch (IOException e) {
+            throw new CommandException("Failed to write report: " + e.getMessage());
+        }
+        
+        if (args.hasFlag('p')) {
+            plugin.checkPermission(sender, "worldguard.report.pastebin");
+            CommandUtils.pastebin(plugin, sender, result, "WorldGuard report: %s.report");
+        }
+    }
+
+    @Command(aliases = {"profile"}, usage = "[<minutes>]",
+            desc = "Profile the CPU usage of the server", min = 0, max = 1,
+            flags = "t:p")
+    @CommandPermissions("worldguard.profile")
+    public void profile(final CommandContext args, final CommandSender sender) throws CommandException {
+        Predicate<ThreadInfo> threadFilter;
+        String threadName = args.getFlag('t');
+        final boolean pastebin;
+
+        if (args.hasFlag('p')) {
+            plugin.checkPermission(sender, "worldguard.report.pastebin");
+            pastebin = true;
+        } else {
+            pastebin = false;
+        }
+
+        if (threadName == null) {
+            threadFilter = new ThreadIdFilter(Thread.currentThread().getId());
+        } else if (threadName.equals("*")) {
+            threadFilter = Predicates.alwaysTrue();
+        } else {
+            threadFilter = new ThreadNameFilter(threadName);
+        }
+
+        int minutes;
+        if (args.argsLength() == 0) {
+            minutes = 5;
+        } else {
+            minutes = args.getInteger(0);
+            if (minutes < 1) {
+                throw new CommandException("You must run the profile for at least 1 minute.");
+            } else if (minutes > 10) {
+                throw new CommandException("You can profile for, at maximum, 10 minutes.");
+            }
+        }
+
+        Sampler sampler;
+
+        synchronized (this) {
+            if (activeSampler != null) {
+                throw new CommandException("A profile is currently in progress! Please use /wg stopprofile to stop the current profile.");
+            }
+
+            SamplerBuilder builder = new SamplerBuilder();
+            builder.setThreadFilter(threadFilter);
+            builder.setRunTime(minutes, TimeUnit.MINUTES);
+            sampler = activeSampler = builder.start();
+        }
+
+        AsyncCommandHelper.wrap(sampler.getFuture(), plugin, sender)
+                .formatUsing(minutes)
+                .registerWithSupervisor("Running CPU profiler for %d minute(s)...")
+                .sendMessageAfterDelay("(Please wait... profiling for %d minute(s)...)")
+                .thenTellErrorsOnly("CPU profiling failed.");
+
+        sampler.getFuture().addListener(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (WorldGuardCommands.this) {
+                    activeSampler = null;
+                }
+            }
+        }, MoreExecutors.directExecutor());
+
+        Futures.addCallback(sampler.getFuture(), new FutureCallback<Sampler>() {
+            @Override
+            public void onSuccess(Sampler result) {
+                String output = result.toString();
+
+                try {
+                    File dest = new File(plugin.getDataFolder(), "profile.txt");
+                    Files.write(output, dest, Charset.forName("UTF-8"));
+                    sender.sendMessage(ChatColor.YELLOW + "CPU profiling data written to " + dest.getAbsolutePath());
+                } catch (IOException e) {
+                    sender.sendMessage(ChatColor.RED + "Failed to write CPU profiling data: " + e.getMessage());
+                }
+
+                if (pastebin) {
+                    CommandUtils.pastebin(plugin, sender, output, "Profile result: %s.profile");
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable throwable) {
+            }
+        });
+    }
+
+    @Command(aliases = {"stopprofile"}, usage = "",desc = "Stop a running profile", min = 0, max = 0)
+    @CommandPermissions("worldguard.profile")
+    public void stopProfile(CommandContext args, final CommandSender sender) throws CommandException {
+        synchronized (this) {
+            if (activeSampler == null) {
+                throw new CommandException("No CPU profile is currently running.");
+            }
+
+            activeSampler.cancel();
+            activeSampler = null;
+        }
+
+        sender.sendMessage("The running CPU profile has been stopped.");
+    }
+
+    @Command(aliases = {"flushstates", "clearstates"},
+            usage = "[player]", desc = "Flush the state manager", max = 1)
+    @CommandPermissions("worldguard.flushstates")
+    public void flushStates(CommandContext args, CommandSender sender) throws CommandException {
+        if (args.argsLength() == 0) {
+            plugin.getSessionManager().resetAllStates();
+            sender.sendMessage("Cleared all states.");
+        } else {
+            Player player = plugin.getServer().getPlayer(args.getString(0));
+            if (player != null) {
+                plugin.getSessionManager().resetState(player);
+                sender.sendMessage("Cleared states for player \"" + player.getName() + "\".");
+            }
+        }
+    }
+
+    @Command(aliases = {"running", "queue"}, desc = "List running tasks", max = 0)
+    @CommandPermissions("worldguard.running")
+    public void listRunningTasks(CommandContext args, CommandSender sender) throws CommandException {
+        List<Task<?>> tasks = plugin.getSupervisor().getTasks();
+
+        if (!tasks.isEmpty()) {
+            Collections.sort(tasks, new TaskStateComparator());
+            StringBuilder builder = new StringBuilder();
+            builder.append(ChatColor.GRAY);
+            builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
+            builder.append(" Running tasks ");
+            builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
+            builder.append("\n").append(ChatColor.GRAY).append("Note: Some 'running' tasks may be waiting to be start.");
+            for (Task task : tasks) {
+                builder.append("\n");
+                builder.append(ChatColor.BLUE).append("(").append(task.getState().name()).append(") ");
+                builder.append(ChatColor.YELLOW);
+                builder.append(CommandUtils.getOwnerName(task.getOwner()));
+                builder.append(": ");
+                builder.append(ChatColor.WHITE);
+                builder.append(task.getName());
+            }
+            sender.sendMessage(builder.toString());
+        } else {
+            sender.sendMessage(ChatColor.YELLOW + "There are currently no running tasks.");
+        }
+    }
+
+    @Command(aliases = {"debug"}, desc = "Debugging commands")
+    @NestedCommand({DebuggingCommands.class})
+    public void debug(CommandContext args, CommandSender sender) {}
+
+}

worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java

@@ -46,9 +46,11 @@ import com.sk89q.worldguard.bukkit.util.logging.LoggerToChatHandler;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.FlagContext;
 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.flags.registry.FlagRegistry;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.managers.RemovalStrategy;
 import com.sk89q.worldguard.protection.managers.migration.DriverMigration;
@@ -60,6 +62,7 @@ import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
+import com.sk89q.worldguard.protection.util.DomainInputResolver.UserLocatorPolicy;
 import com.sk89q.worldguard.util.Enums;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -68,6 +71,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -201,9 +205,9 @@ public final class RegionCommands extends RegionCommandsBase {
      * @throws CommandException any error
      */
     @Command(aliases = {"claim"},
-             usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
+             usage = "<id>",
              desc = "Claim a region",
-             min = 1)
+             min = 1, max = 1)
     public void claim(CommandContext args, CommandSender sender) throws CommandException {
         warnAboutSaveFailures(sender);
 
@@ -279,9 +283,9 @@ public final class RegionCommands extends RegionCommandsBase {
             }
         }
 
-        region.getOwners().addPlayer(player.getName());
-
         RegionAdder task = new RegionAdder(plugin, manager, region);
+        task.setLocatorPolicy(UserLocatorPolicy.UUID_ONLY);
+        task.setOwnersInput(new String[]{player.getName()});
         ListenableFuture<?> future = plugin.getExecutorService().submit(task);
 
         AsyncCommandHelper.wrap(future, plugin, player)
@@ -465,6 +469,7 @@ public final class RegionCommands extends RegionCommandsBase {
         String flagName = args.getString(1);
         String value = args.argsLength() >= 3 ? args.getJoinedStrings(2) : null;
         RegionGroup groupValue = null;
+        FlagRegistry flagRegistry = plugin.getFlagRegistry();
         RegionPermissionModel permModel = getPermissionModel(sender);
 
         if (args.hasFlag('e')) {
@@ -489,29 +494,44 @@ public final class RegionCommands extends RegionCommandsBase {
             throw new CommandPermissionsException();
         }
 
-        Flag<?> foundFlag = DefaultFlag.fuzzyMatchFlag(flagName);
+        Flag<?> foundFlag = DefaultFlag.fuzzyMatchFlag(flagRegistry, flagName);
 
         // We didn't find the flag, so let's print a list of flags that the user
         // can use, and do nothing afterwards
         if (foundFlag == null) {
-            StringBuilder list = new StringBuilder();
+            ArrayList<String> flagList = new ArrayList<>();
 
             // Need to build a list
-            for (Flag<?> flag : DefaultFlag.getFlags()) {
+            for (Flag<?> flag : flagRegistry) {
                 // Can the user set this flag?
                 if (!permModel.maySetFlag(existing, flag)) {
                     continue;
                 }
 
-                if (list.length() > 0) {
+                flagList.add(flag.getName());
+            }
+
+            Collections.sort(flagList);
+
+            StringBuilder list = new StringBuilder();
+
+            for (int i = 0; i < flagList.size(); i++) {
+                String flag = flagList.get(i);
+
+                if (i % 2 == 0) {
+                    list.append(ChatColor.GRAY);
+                } else {
+                    list.append(ChatColor.RED);
+                }
+
+                list.append(flag);
+                if ((i + 1) < flagList.size()) {
                     list.append(", ");
                 }
-                
-                list.append(flag.getName());
             }
 
             sender.sendMessage(ChatColor.RED + "Unknown flag specified: " + flagName);
-            sender.sendMessage(ChatColor.RED + "Available " + "flags: " + list);
+            sender.sendMessage(ChatColor.RED + "Available flags: " + list);
             
             return;
         }
@@ -536,7 +556,7 @@ public final class RegionCommands extends RegionCommandsBase {
             // Parse the [-g group] separately so entire command can abort if parsing
             // the [value] part throws an error.
             try {
-                groupValue = groupFlag.parseInput(plugin, sender, group);
+                groupValue = groupFlag.parseInput(FlagContext.create().setSender(sender).setInput(group).setObject("region", existing).build());
             } catch (InvalidFlagFormat e) {
                 throw new CommandException(e.getMessage());
             }
@@ -912,7 +932,7 @@ public final class RegionCommands extends RegionCommandsBase {
             throw new CommandException("The driver specified as 'to' does not seem to be supported in your version of WorldGuard.");
         }
 
-        DriverMigration migration = new DriverMigration(fromDriver, toDriver);
+        DriverMigration migration = new DriverMigration(fromDriver, toDriver, plugin.getFlagRegistry());
 
         LoggerToChatHandler handler = null;
         Logger minecraftLogger = null;
@@ -971,7 +991,7 @@ public final class RegionCommands extends RegionCommandsBase {
             ConfigurationManager config = plugin.getGlobalStateManager();
             RegionContainer container = plugin.getRegionContainer();
             RegionDriver driver = container.getDriver();
-            UUIDMigration migration = new UUIDMigration(driver, plugin.getProfileService());
+            UUIDMigration migration = new UUIDMigration(driver, plugin.getProfileService(), plugin.getFlagRegistry());
             migration.setKeepUnresolvedNames(config.keepUnresolvedNames);
             sender.sendMessage(ChatColor.YELLOW + "Now performing migration... this may take a while.");
             container.migrate(migration);

worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommandsBase.java

@@ -35,6 +35,7 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.bukkit.permission.RegionPermissionModel;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.FlagContext;
 import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
@@ -391,7 +392,7 @@ class RegionCommandsBase {
      * @throws InvalidFlagFormat thrown if the value is invalid
      */
     protected static <V> void setFlag(ProtectedRegion region, Flag<V> flag, CommandSender sender, String value) throws InvalidFlagFormat {
-        region.setFlag(flag, flag.parseInput(WorldGuardPlugin.inst(), sender, value));
+        region.setFlag(flag, flag.parseInput(FlagContext.create().setSender(sender).setInput(value).setObject("region", region).build()));
     }
 
 }

worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionPrintoutBuilder.java

@@ -21,10 +21,12 @@ package com.sk89q.worldguard.bukkit.commands.region;
 
 import com.sk89q.squirrelid.cache.ProfileCache;
 import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -105,7 +107,7 @@ public class RegionPrintoutBuilder implements Callable<String> {
     public void appendFlagsList(boolean useColors) {
         boolean hasFlags = false;
         
-        for (Flag<?> flag : DefaultFlag.getFlags()) {
+        for (Flag<?> flag : WorldGuardPlugin.inst().getFlagRegistry()) {
             Object val = region.getFlag(flag), group = null;
             
             // No value