Bump version

Fix compile errors in the fawe 1.17 module
Fix startup errors, bump fawe version
2026-11-07 01:42:34 -05:00 · 2021-08-16 13:30:46 +02:00 · 2021-08-16 13:26:50 +02:00 · 2021-08-16 13:23:26 +02:00 · 2021-06-29 22:38:59 +02:00 · 2021-06-24 17:25:14 +02:00
134 changed files with 8797 additions and 9965 deletions
@@ -2,7 +2,7 @@
 name: Bug report
 about: Report a problem in the plugin
 title: ''
-labels: 'Type: Bug'
+labels: 'NEW, Type: Bug'
 assignees: ''

 ---
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea
 title: ''
-labels: 'Type: Feature'
+labels: 'NEW, Type: Feature'
 assignees: ''

 ---
@@ -2,7 +2,7 @@
 name: Support question
 about: Ask help with the setup or usage of the plugin
 title: ''
-labels: 'Type: Support'
+labels: 'NEW, Type: Support'
 assignees: ''

 ---
@@ -0,0 +1,38 @@
+name : "build"
+
+on : [ "pull_request", "push" ]
+
+jobs :
+  build :
+    strategy :
+      matrix :
+        java : [ 16 ]
+        # java: ["1.8", "11"]
+        os : [ "ubuntu-18.04" ]
+    runs-on : "${{ matrix.os }}"
+    steps :
+      - name : "Checkout Repository"
+        uses : "actions/checkout@v2.3.4"
+
+      - name : "Checkout submodules"
+        uses : "srt32/git-actions@v0.0.3"
+        with :
+          args : "git submodule update --init --recursive"
+
+      - name : "Restore Gradle cache"
+        uses : "actions/cache@v2"
+        with :
+          path : "~/.gradle/caches"
+          key : "${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}"
+          restore-keys : |
+            ${{ runner.os }}-gradle-
+      - name : "Setup JDK ${{ matrix.java }}"
+        uses : "actions/setup-java@v1.4.3"
+        with :
+          java-version : "${{ matrix.java }}"
+
+      - name : "Grant execute permission for gradlew"
+        run : "chmod +x gradlew"
+
+      - name : "Build with Gradle"
+        run : "./gradlew clean build"
@@ -1,5 +1,5 @@
-# Maven stuff
-/target
+### Maven ###
+target

 .project
 .metadata
@@ -14,12 +14,31 @@ local.properties
 .settings/
 .loadpath

-# Locally stored "Eclipse launch configurations"
+### Locally stored "Eclipse launch configurations" ###
 *.launch

-# IntelliJ IDEA
+### IntelliJ IDEA ###
 *.iml
 .idea
 dependency-reduced-pom.xml

 desktop.ini
+
+### Gradle ###
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Gradle Patch ###
+**/build/
@@ -1 +0,0 @@
-/target
@@ -0,0 +1,60 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+    id 'java-library'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
+}
+
+description = 'AreaShop'
+version = '2.6.4'
+
+dependencies {
+    // Spigot api
+    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
+
+    // Libs
+    implementation 'com.github.NLthijs48:InteractiveMessenger:e7749258ca'
+    implementation 'co.aikar:taskchain-bukkit:3.7.2'
+    implementation 'io.papermc:paperlib:1.0.6'
+
+    // Hooks
+    implementation project(':areashop-interface')
+    implementation project(':areashop-worldguard-7')
+    implementation project(':areashop-worldedit-7')
+    implementation project(':areashop-fawe-1-16')
+    implementation project(':areashop-fawe-1-17')
+    implementation project(':areashop-nms-1-16-5')
+    implementation project(':areashop-nms-1-17')
+
+    // Runtime plugins
+    compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.5'
+    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.5'
+    compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
+}
+
+processResources {
+
+    from (sourceSets.main.resources) {
+        filter ReplaceTokens, tokens: [version: project.version]
+        duplicatesStrategy(DuplicatesStrategy.INCLUDE)
+    }
+}
+
+assemble {
+    dependsOn(shadowJar)
+}
+
+jar {
+    archiveBaseName.set('AreaShop')
+    classifier('original')
+}
+
+shadowJar {
+    archiveBaseName.set('AreaShop')
+    String relocationBase = 'me.wiefferink.areashop.shaded'
+    classifier('')
+    relocate('co.aikar.taskchain', "${relocationBase}.taskchain")
+    relocate('me.wiefferink.interactivemessenger', "${relocationBase}.interactivemessenger")
+    relocate('org.bstats', "${relocationBase}.bstats")
+    relocate('io.papermc', "${relocationBase}.papermc")
+}
@@ -1,311 +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>
-    <artifactId>areashop</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop</name>
-    <version>2.6.0</version> <!-- Main plugin version -->
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <!-- Bukkit, AreaShop aims to support 1.7.9+ -->
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/craftbukkit-1.7.9-R0.2-SNAPSHOT.jar</systemPath>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- InteractiveMessenger library -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>interactivemessenger</artifactId>
-            <version>1.1-SNAPSHOT</version>
-        </dependency>
-
-        <!-- BukkitDo library -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>bukkitdo</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- WorldEdit/WorldGuard -->
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-04.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-02.jar</systemPath>
-        </dependency>
-
-        <!-- Interfaces that specific WorldGuard and WorldEdit versions are built against -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- WorldGuard implementations -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-5</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-6</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-6_1_3</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-7_beta_1</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-7_beta_2</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- WorldEdit implementations -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-5</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-6</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-7_beta_1</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-7_beta_4</artifactId>
-            <version>latest</version>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-fastasyncworldedit</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- Vault -->
-        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/VaultAPI-1.4.jar</systemPath>
-        </dependency>
-
-        <!-- bStats -->
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>1.1</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <!-- Copy the jar file to a test server, activate by using -DcopyResult="/path/to/test/server" -->
-        <profile>
-            <id>test-locally</id>
-            <activation>
-                <property>
-                    <name>copyResult</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
-                        <configuration>
-                            <target>
-                                <copy file="./target/${project.build.finalName}.jar"
-                                      tofile="${copyResult}\${project.build.finalName}.jar"/>
-                            </target>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <!-- Package the source files in a jar, activate by using -Dsources -->
-        <profile>
-            <id>package-sources</id>
-            <activation>
-                <property>
-                    <name>sources</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <!-- Produce javadoc files, activate by using -Djavadoc -->
-        <profile>
-            <id>generate-javadoc</id>
-            <activation>
-                <property>
-                    <name>javadoc</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.4</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <excludePackageNames>me.wiefferink.areashop.lib</excludePackageNames>
-                            <destDir>${javadoc}</destDir>
-                            <links>
-                                <link>https://hub.spigotmc.org/javadocs/bukkit/</link>
-                                <link>http://docs.sk89q.com/worldedit/apidocs/</link>
-                                <link>http://docs.sk89q.com/worldguard/apidocs/</link>
-                            </links>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <build>
-        <directory>target</directory>
-        <finalName>AreaShop</finalName>
-        <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>plugin.yml</include>
-                    <include>config.yml</include>
-                    <include>hiddenConfig.yml</include>
-                    <include>default.yml</include>
-                    <include>README.md</include>
-                    <include>lang/*.yml</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <relocations>
-                                <!-- Relocate messaging framework -->
-                                <relocation>
-                                    <pattern>me.wiefferink.interactivemessenger</pattern>
-                                    <shadedPattern>me.wiefferink.areashop.shaded.interactivemessenger</shadedPattern>
-                                </relocation>
-                                <!-- Relocate BukkitDo -->
-                                <relocation>
-                                    <pattern>me.wiefferink.bukkitdo</pattern>
-                                    <shadedPattern>me.wiefferink.areashop.shaded.bukkitdo</shadedPattern>
-                                </relocation>
-                                <!-- Relocate bstats -->
-                                <relocation>
-                                    <pattern>org.bstats</pattern>
-                                    <shadedPattern>me.wiefferink.areashop.shaded.bstats</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>
@@ -2,25 +2,24 @@ package me.wiefferink.areashop.commands;

 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
+import me.wiefferink.areashop.events.ask.RentingRegionEvent;
+import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
+import me.wiefferink.areashop.events.notify.RentedRegionEvent;
 import me.wiefferink.areashop.interfaces.WorldEditSelection;
 import me.wiefferink.areashop.managers.FileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
-import me.wiefferink.bukkitdo.Do;
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;

 public class AddCommand extends CommandAreaShop {
@@ -57,7 +56,7 @@ public class AddCommand extends CommandAreaShop {
 			return;
 		}

-		if(args.length < 2 || args[1] == null || (!"rent".equals(args[1].toLowerCase()) && !"buy".equals(args[1].toLowerCase()))) {
+		if(args.length < 2 || args[1] == null || (!"rent".equalsIgnoreCase(args[1]) && !"buy".equalsIgnoreCase(args[1]))) {
 			plugin.message(sender, "add-help");
 			return;
 		}
@@ -79,7 +78,7 @@ public class AddCommand extends CommandAreaShop {
 			}
 			world = selection.getWorld();
 			regions = Utils.getWorldEditRegionsInSelection(selection).stream().collect(Collectors.toMap(ProtectedRegion::getId, region -> region));
-			if(regions.size() == 0) {
+			if(regions.isEmpty()) {
 				plugin.message(player, "cmd-noWERegionsFound");
 				return;
 			}
@@ -113,19 +112,21 @@ public class AddCommand extends CommandAreaShop {
 			}
 			regions.put(args[2], region);
 		}
-		final boolean isRent = "rent".equals(args[1].toLowerCase());
+		final boolean isRent = "rent".equalsIgnoreCase(args[1]);
 		final Player finalPlayer = player;
 		AreaShop.debug("Starting add task with " + regions.size() + " regions");

 		TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
 		TreeSet<GeneralRegion> regionsAlready = new TreeSet<>();
 		TreeSet<GeneralRegion> regionsAlreadyOtherWorld = new TreeSet<>();
+		TreeSet<GeneralRegion> regionsRentCancelled = new TreeSet<>(); // Denied by an event listener
+		TreeSet<GeneralRegion> regionsBuyCancelled = new TreeSet<>(); // Denied by an event listener
 		TreeSet<String> namesBlacklisted = new TreeSet<>();
 		TreeSet<String> namesNoPermission = new TreeSet<>();
-		Do.forAll(
-			plugin.getConfig().getInt("adding.regionsPerTick"),
-			regions.entrySet(),
-			regionEntry -> {
+		TreeSet<String> namesAddCancelled = new TreeSet<>(); // Denied by an event listener
+		Utils.runAsBatches(regions.entrySet(),
+			Math.min(plugin.getConfig().getInt("adding.regionsPerTick"), 1),
+				(regionEntry) -> {
 				String regionName = regionEntry.getKey();
 				ProtectedRegion region = regionEntry.getValue();
 				// Determine if the player is an owner or member of the region
@@ -170,40 +171,40 @@ public class AddCommand extends CommandAreaShop {
 						if(landlord) {
 							rent.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
 						}
-						// Run commands
-						rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
-						plugin.getFileManager().addRent(rent);
+
+						AddingRegionEvent event = plugin.getFileManager().addRegion(rent);
+						if (event.isCancelled()) {
+							namesAddCancelled.add(rent.getName());
+							return;
+						}
 						rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-
 						rent.update();

-						// Run commands
-						rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-
 						// Add existing owners/members if any
 						if(!landlord && !existing.isEmpty()) {
-							// TODO also execute rent events to notify other plugins?
+							UUID rentBy = existing.remove(0);
+							OfflinePlayer rentByPlayer = Bukkit.getOfflinePlayer(rentBy);

-							// Run commands
-							rent.runEventCommands(GeneralRegion.RegionEvent.RENTED, true);
+							RentingRegionEvent rentingRegionEvent = new RentingRegionEvent(rent, rentByPlayer, false);
+							Bukkit.getPluginManager().callEvent(rentingRegionEvent);
+							if(rentingRegionEvent.isCancelled()) {
+								regionsRentCancelled.add(rent);
+							} else {
+								// Add values to the rent and send it to FileManager
+								rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
+								rent.setRenter(rentBy);
+								rent.updateLastActiveTime();

-							// Add values to the rent and send it to FileManager
-							rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
-							rent.setRenter(existing.remove(0));
-							rent.updateLastActiveTime();
+								// Fire schematic event and updated times extended
+								rent.handleSchematicEvent(GeneralRegion.RegionEvent.RENTED);

-							// Add others as friends
-							for(UUID friend : existing) {
-								rent.getFriendsFeature().addFriend(friend, null);
+								// Add others as friends
+								for(UUID friend : existing) {
+									rent.getFriendsFeature().addFriend(friend, null);
+								}
+
+								rent.notifyAndUpdate(new RentedRegionEvent(rent, false));
 							}
-
-							// Fire schematic event and updated times extended
-							rent.handleSchematicEvent(GeneralRegion.RegionEvent.RENTED);
-
-							// Notify about updates
-							rent.update();
-
-							rent.runEventCommands(GeneralRegion.RegionEvent.RENTED, false);
 						}

 						regionsSuccess.add(rent);
@@ -213,47 +214,47 @@ public class AddCommand extends CommandAreaShop {
 						if(landlord) {
 							buy.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
 						}
-						// Run commands
-						buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);

-						plugin.getFileManager().addBuy(buy);
+						AddingRegionEvent event = plugin.getFileManager().addRegion(buy);
+						if (event.isCancelled()) {
+							namesAddCancelled.add(buy.getName());
+							return;
+						}
+
 						buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-
 						buy.update();

-						// Run commands
-						buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-
 						// Add existing owners/members if any
 						if(!landlord && !existing.isEmpty()) {
-							// TODO also execute buy events to notify for other plugins?
+							UUID buyBy = existing.remove(0);
+							OfflinePlayer buyByPlayer = Bukkit.getOfflinePlayer(buyBy);

-							// Run commands
-							buy.runEventCommands(GeneralRegion.RegionEvent.BOUGHT, true);
+							BuyingRegionEvent buyingRegionEvent = new BuyingRegionEvent(buy, buyByPlayer);
+							Bukkit.getPluginManager().callEvent(buyingRegionEvent);
+							if(buyingRegionEvent.isCancelled()) {
+								regionsBuyCancelled.add(buy);
+							} else {
+								// Set the owner
+								buy.setBuyer(buyBy);
+								buy.updateLastActiveTime();

-							// Set the owner
-							buy.setBuyer(existing.remove(0));
-							buy.updateLastActiveTime();
-							// Add others as friends
-							for(UUID friend : existing) {
-								buy.getFriendsFeature().addFriend(friend, null);
+								// Update everything
+								buy.handleSchematicEvent(GeneralRegion.RegionEvent.BOUGHT);
+
+								// Add others as friends
+								for (UUID friend : existing) {
+									buy.getFriendsFeature().addFriend(friend, null);
+								}
+
+								buy.notifyAndUpdate(new BoughtRegionEvent(buy));
 							}
-
-							// Notify about updates
-							buy.update();
-
-							// Update everything
-							buy.handleSchematicEvent(GeneralRegion.RegionEvent.BOUGHT);
-
-							// Run commands
-							buy.runEventCommands(GeneralRegion.RegionEvent.BOUGHT, false);
 						}

 						regionsSuccess.add(buy);
 					}
 				}
-			},
-			() -> {
+			}, false).thenAccept(
+			(success) -> {
 				if(!regionsSuccess.isEmpty()) {
 					plugin.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
 				}
@@ -263,6 +264,12 @@ public class AddCommand extends CommandAreaShop {
 				if(!regionsAlreadyOtherWorld.isEmpty()) {
 					plugin.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
 				}
+				if(!regionsRentCancelled.isEmpty()) {
+					plugin.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
+				}
+				if(!regionsBuyCancelled.isEmpty()) {
+					plugin.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
+				}
 				if(!namesBlacklisted.isEmpty()) {
 					plugin.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
 				}
@@ -270,13 +277,15 @@ public class AddCommand extends CommandAreaShop {
 					plugin.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
 					plugin.message(sender, "add-noPermissionOwnerMember");
 				}
-			}
-		);
+				if(!namesAddCancelled.isEmpty()) {
+					plugin.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
+				}
+			});
 	}

 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
+		List<String> result = new LinkedList<>();
 		if(toComplete == 2) {
 			if(sender.hasPermission("areashop.createrent")) {
 				result.add("rent");
@@ -7,9 +7,12 @@ import me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Sign;
+import org.bukkit.block.data.type.WallSign;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.material.Sign;
 import org.bukkit.util.BlockIterator;

 import java.util.ArrayList;
@@ -18,100 +21,108 @@ import java.util.Set;

 public class AddsignCommand extends CommandAreaShop {

-	@Override
-	public String getCommandStart() {
-		return "areashop addsign";
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop addsign";
+    }

-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.addsign")) {
-			return "help-addsign";
-		}
-		return null;
-	}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.addsign")) {
+            return "help-addsign";
+        }
+        return null;
+    }

-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.addsign")) {
-			plugin.message(sender, "addsign-noPermission");
-			return;
-		}
-		if(!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
-			return;
-		}
-		Player player = (Player)sender;
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.addsign")) {
+            plugin.message(sender, "addsign-noPermission");
+            return;
+        }
+        if (!(sender instanceof Player)) {
+            plugin.message(sender, "cmd-onlyByPlayer");
+            return;
+        }
+        Player player = (Player) sender;

-		// Get the sign
-		Block block = null;
-		BlockIterator blockIterator = new BlockIterator(player, 100);
-		while(blockIterator.hasNext() && block == null) {
-			Block next = blockIterator.next();
-			if(next.getType() != Material.AIR) {
-				block = next;
-			}
-		}
-		if(block == null || !Materials.isSign(block.getType())) {
-			plugin.message(sender, "addsign-noSign");
-			return;
-		}
+        // Get the sign
+        Block block = null;
+        BlockIterator blockIterator = new BlockIterator(player, 100);
+        while (blockIterator.hasNext() && block == null) {
+            Block next = blockIterator.next();
+            if (next.getType() != Material.AIR) {
+                block = next;
+            }
+        }
+        if (block == null || !Materials.isSign(block.getType())) {
+            plugin.message(sender, "addsign-noSign");
+            return;
+        }

-		GeneralRegion region;
-		if(args.length > 1) {
-			// Get region by argument
-			region = plugin.getFileManager().getRegion(args[1]);
-			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[1]);
-				return;
-			}
-		} else {
-			// Get region by sign position
-			List<GeneralRegion> regions = Utils.getImportantRegions(block.getLocation());
-			if(regions.isEmpty()) {
-				plugin.message(sender, "addsign-noRegions");
-				return;
-			} else if(regions.size() > 1) {
-				plugin.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
-				return;
-			}
-			region = regions.get(0);
-		}
-		Sign sign = (Sign)block.getState().getData();
-		String profile = null;
-		if(args.length > 2) {
-			profile = args[2];
-			Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
-			if(!profiles.contains(profile)) {
-				plugin.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
-				return;
-			}
-		}
-		RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-		if(regionSign != null) {
-			plugin.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
-			return;
-		}
+        GeneralRegion region;
+        if (args.length > 1) {
+            // Get region by argument
+            region = plugin.getFileManager().getRegion(args[1]);
+            if (region == null) {
+                plugin.message(sender, "cmd-notRegistered", args[1]);
+                return;
+            }
+        } else {
+            // Get region by sign position
+            List<GeneralRegion> regions = Utils.getImportantRegions(block.getLocation());
+            if (regions.isEmpty()) {
+                plugin.message(sender, "addsign-noRegions");
+                return;
+            } else if (regions.size() > 1) {
+                plugin.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
+                return;
+            }
+            region = regions.get(0);
+        }
+        String profile = null;
+        if (args.length > 2) {
+            profile = args[2];
+            Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
+            if (!profiles.contains(profile)) {
+                plugin.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
+                return;
+            }
+        }
+        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+        if (regionSign != null) {
+            plugin.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
+            return;
+        }

-		region.getSignsFeature().addSign(block.getLocation(), block.getType(), sign.getFacing(), profile);
-		if(profile == null) {
-			plugin.message(sender, "addsign-success", region);
-		} else {
-			plugin.message(sender, "addsign-successProfile", profile, region);
-		}
-		region.update();
-	}
+        final BlockData data = block.getBlockData();
+        final BlockFace rotation;
+        if (data instanceof Sign) {
+            rotation = ((Sign) data).getRotation();
+        } else if (data instanceof WallSign) {
+            rotation = ((WallSign) data).getFacing();
+        } else {
+            rotation = null;
+        }
+        region.getSignsFeature().addSign(block.getLocation(), block.getType(), rotation, profile);
+        if (profile == null) {
+            plugin.message(sender, "addsign-success", region);
+        } else {
+            plugin.message(sender, "addsign-successProfile", profile, region);
+        }
+        region.update();
+    }

-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result.addAll(plugin.getFileManager().getRegionNames());
-		} else if(toComplete == 3) {
-			result.addAll(plugin.getConfig().getStringList("signProfiles"));
-		}
-		return result;
-	}
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        List<String> result = new ArrayList<>();
+        if (toComplete == 2) {
+            result.addAll(plugin.getFileManager().getRegionNames());
+        } else if (toComplete == 3) {
+            result.addAll(plugin.getConfig().getStringList("signProfiles"));
+        }
+        return result;
+    }

 }

@@ -6,10 +6,7 @@ import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;

 /**
 * Abstract class for generalising command classes.
@@ -46,7 +43,7 @@ public abstract class CommandAreaShop {
 	 * @return A collection with all the possibilities for argument to complete
 	 */
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		return new ArrayList<>();
+		return Collections.emptyList();
 	}

 	/**
@@ -89,9 +86,9 @@ public abstract class CommandAreaShop {
 		return false;
 	}

-	private class CommandTime {
-		public String command;
-		public long time;
+	private static class CommandTime {
+		public final String command;
+		public final long time;

 		CommandTime(String command, long time) {
 			this.command = command;
@@ -1,5 +1,6 @@
 package me.wiefferink.areashop.commands;

+import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
 import me.wiefferink.areashop.interfaces.WorldEditSelection;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
@@ -11,6 +12,7 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;
+import java.util.concurrent.CompletableFuture;

 public class DelCommand extends CommandAreaShop {

@@ -50,62 +52,82 @@ public class DelCommand extends CommandAreaShop {
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions == null || regions.size() == 0) {
+			if(regions.isEmpty()) {
 				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			// Start removing the regions that he has permission for
 			ArrayList<String> namesSuccess = new ArrayList<>();
-			TreeSet<GeneralRegion> namesFailed = new TreeSet<>();
+			TreeSet<GeneralRegion> regionsFailed = new TreeSet<>();
+			TreeSet<GeneralRegion> regionsCancelled = new TreeSet<>();
 			for(GeneralRegion region : regions) {
 				boolean isLandlord = region.isLandlord(((Player)sender).getUniqueId());
 				if(region instanceof RentRegion) {
 					if(!sender.hasPermission("areashop.destroyrent") && !(isLandlord && sender.hasPermission("areashop.destroyrent.landlord"))) {
-						namesFailed.add(region);
-					} else {
-						plugin.getFileManager().removeRent((RentRegion)region, true);
-						namesSuccess.add(region.getName());
+						regionsFailed.add(region);
+						continue;
 					}
 				} else if(region instanceof BuyRegion) {
 					if(!sender.hasPermission("areashop.destroybuy") && !(isLandlord && sender.hasPermission("areashop.destroybuy.landlord"))) {
-						namesFailed.add(region);
-					} else {
-						plugin.getFileManager().removeBuy((BuyRegion)region, true);
-						namesSuccess.add(region.getName());
+						regionsFailed.add(region);
+						continue;
 					}
 				}
+
+				DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
+				if (event.isCancelled()) {
+					regionsCancelled.add(region);
+				} else {
+					namesSuccess.add(region.getName());
+				}
 			}
-			// send messages
-			if(namesSuccess.size() != 0) {
+
+			// Send messages
+			if(!namesSuccess.isEmpty()) {
 				plugin.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
 			}
-			if(namesFailed.size() != 0) {
-				plugin.message(sender, "del-failed", Utils.combinedMessage(namesFailed, "region"));
+			if(!regionsFailed.isEmpty()) {
+				plugin.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
+			}
+			if(!regionsCancelled.isEmpty()) {
+				plugin.message(sender, "del-cancelled", Utils.combinedMessage(regionsCancelled, "region"));
 			}
 		} else {
-			GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
-			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[1]);
-				return;
-			}
-			boolean isLandlord = sender instanceof Player && region.isLandlord(((Player)sender).getUniqueId());
-			if(region instanceof RentRegion) {
-				// Remove the rent if the player has permission
-				if(sender.hasPermission("areashop.destroyrent") || (isLandlord && sender.hasPermission("areashop.destroyrent.landlord"))) {
-					plugin.getFileManager().removeRent((RentRegion)region, true);
-					plugin.message(sender, "destroy-successRent", region);
-				} else {
-					plugin.message(sender, "destroy-noPermissionRent", region);
-				}
-			} else if(region instanceof BuyRegion) {
-				// Remove the buy if the player has permission
-				if(sender.hasPermission("areashop.destroybuy") || (isLandlord && sender.hasPermission("areashop.destroybuy.landlord"))) {
-					plugin.getFileManager().removeBuy((BuyRegion)region, true);
-					plugin.message(sender, "destroy-successBuy", region);
-				} else {
-					plugin.message(sender, "destroy-noPermissionBuy", region);
-				}
-			}
+			CompletableFuture<GeneralRegion> future = plugin.getFileManager().getRegionUnsafe(args[1]);
+			Utils.newChain()
+				 .future(future)
+				 .syncLast(region -> {
+					 if(region == null) {
+						 plugin.message(sender, "cmd-notRegistered", args[1]);
+						 return;
+					 }
+					 boolean isLandlord = sender instanceof Player && region.isLandlord(((Player)sender).getUniqueId());
+					 if(region instanceof RentRegion) {
+						 // Remove the rent if the player has permission
+						 if(sender.hasPermission("areashop.destroyrent") || (isLandlord && sender.hasPermission("areashop.destroyrent.landlord"))) {
+							 DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
+							 if (event.isCancelled()) {
+								 plugin.message(sender, "general-cancelled", event.getReason());
+							 } else {
+								 plugin.message(sender, "destroy-successRent", region);
+							 }
+						 } else {
+							 plugin.message(sender, "destroy-noPermissionRent", region);
+						 }
+					 } else if(region instanceof BuyRegion) {
+						 // Remove the buy if the player has permission
+						 if(sender.hasPermission("areashop.destroybuy") || (isLandlord && sender.hasPermission("areashop.destroybuy.landlord"))) {
+							 DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
+							 if (event.isCancelled()) {
+								 plugin.message(sender, "general-cancelled", event.getReason());
+							 } else {
+								 plugin.message(sender, "destroy-successBuy", region);
+							 }
+						 } else {
+							 plugin.message(sender, "destroy-noPermissionBuy", region);
+						 }
+					 }
+			}).execute();
 		}
 	}

@@ -11,6 +11,7 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;

 public class FindCommand extends CommandAreaShop {

@@ -82,7 +83,7 @@ public class FindCommand extends CommandAreaShop {
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
-				BuyRegion region = results.get(new Random().nextInt(results.size()));
+				BuyRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
 				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
@@ -122,7 +123,7 @@ public class FindCommand extends CommandAreaShop {
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
-				RentRegion region = results.get(new Random().nextInt(results.size()));
+				RentRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
 				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
@@ -53,7 +53,7 @@ public class GroupaddCommand extends CommandAreaShop {
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions.size() == 0) {
+			if(regions.isEmpty()) {
 				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
@@ -66,10 +66,10 @@ public class GroupaddCommand extends CommandAreaShop {
 					regionsFailed.add(region);
 				}
 			}
-			if(regionsSuccess.size() != 0) {
+			if(!regionsSuccess.isEmpty()) {
 				plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
-			if(regionsFailed.size() != 0) {
+			if(!regionsFailed.isEmpty()) {
 				plugin.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
@@ -54,7 +54,7 @@ public class GroupdelCommand extends CommandAreaShop {
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions.size() == 0) {
+			if(regions.isEmpty()) {
 				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
@@ -67,10 +67,10 @@ public class GroupdelCommand extends CommandAreaShop {
 					regionsFailed.add(region);
 				}
 			}
-			if(regionsSuccess.size() != 0) {
+			if(!regionsSuccess.isEmpty()) {
 				plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
-			if(regionsFailed.size() != 0) {
+			if(!regionsFailed.isEmpty()) {
 				plugin.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
@@ -40,7 +40,7 @@ public class GroupinfoCommand extends CommandAreaShop {
 			return;
 		}
 		Set<String> members = group.getMembers();
-		if(members.size() == 0) {
+		if(members.isEmpty()) {
 			plugin.message(sender, "groupinfo-noMembers", group.getName());
 		} else {
 			plugin.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
@@ -28,7 +28,7 @@ public class GrouplistCommand extends CommandAreaShop {
 			return;
 		}
 		List<String> groups = plugin.getFileManager().getGroupNames();
-		if(groups.size() == 0) {
+		if(groups.isEmpty()) {
 			plugin.message(sender, "grouplist-noGroups");
 		} else {
 			plugin.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
@@ -27,11 +27,11 @@ public class ImportCommand extends CommandAreaShop {
 		return null;
 	}

-	// TODO
-	// - Landlord?
-	// - Friends
-	// - Region flags?
-	// - Settings from the 'permissions' section in RegionForSale/config.yml?
+	// TODO:
+	//  - Landlord?
+	//  - Friends
+	//  - Region flags?
+	//  - Settings from the 'permissions' section in RegionForSale/config.yml?

 	@Override
 	public void execute(CommandSender sender, String[] args) {
@@ -54,7 +54,7 @@ public class ImportCommand extends CommandAreaShop {
 			return;
 		}

-		ImportJob importJob = new ImportJob(sender);
+		new ImportJob(sender);
 	}

 	@Override
@@ -4,6 +4,7 @@ import com.google.common.base.Charsets;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
 import me.wiefferink.areashop.features.signs.RegionSign;
 import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.regions.BuyRegion;
@@ -240,10 +241,13 @@ public class ImportJob {
 				GeneralRegion region;
 				if(rentable || (owner != null && !isBought)) {
 					region = new RentRegion(regionKey, world);
-					plugin.getFileManager().addRent((RentRegion)region);
 				} else {
 					region = new BuyRegion(regionKey, world);
-					plugin.getFileManager().addBuy((BuyRegion)region);
+				}
+				AddingRegionEvent event = plugin.getFileManager().addRegion(region);
+				if (event.isCancelled()) {
+					messageNoPrefix("general-cancelled", event.getReason());
+					continue;
 				}

 				// Import settings
@@ -330,7 +334,7 @@ public class ImportJob {
 		String buyPrice = from.getString("economic-settings.cost-per-unit.buy");
 		String sellPrice = from.getString("economic-settings.cost-per-unit.selling-price");
 		// TODO: There is no easy way to import this, setup eventCommandsProfile?
-		String taxes = from.getString("economic-settings.cost-per-unit.taxes");
+		// String taxes = from.getString("economic-settings.cost-per-unit.taxes");

 		// Determine unit and add that to the price
 		String unitSuffix = "";
@@ -411,8 +415,8 @@ public class ImportJob {
 	}

 	private static class TimeUnit {
-		public long minutes;
-		public String identifier;
+		public final long minutes;
+		public final String identifier;

 		TimeUnit(long minutes, String identifier) {
 			this.minutes = minutes;
@@ -113,9 +113,9 @@ public class InfoCommand extends CommandAreaShop {
 			}
 			// Page status
 			if(totalPages > 1) {
-				String pageString = "" + page;
+				StringBuilder pageString = new StringBuilder("" + page);
 				for(int i = pageString.length(); i < (totalPages + "").length(); i++) {
-					pageString = "0" + pageString;
+					pageString.insert(0, "0");
 				}
 				footer.append(Message.fromKey("info-pageStatus").replacements(page, totalPages));
 				if(page < totalPages) {
@@ -19,9 +19,7 @@ public class MessageCommand extends CommandAreaShop {

 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.message")) {
-			return null; // Internal command, no need to show in the help list
-		}
+		// Internal command, no need to show in the help list
 		return null;
 	}

@@ -20,7 +20,7 @@ public class SetteleportCommand extends CommandAreaShop {

 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.teleportall") || target.hasPermission("areashop.teleport")) {
+		if(target.hasPermission("areashop.setteleportall") || target.hasPermission("areashop.setteleport")) {
 			return "help-setteleport";
 		}
 		return null;
@@ -3,6 +3,7 @@ package me.wiefferink.areashop.commands;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
 import me.wiefferink.areashop.interfaces.WorldEditSelection;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
@@ -157,33 +158,16 @@ public class StackCommand extends CommandAreaShop {
 					current++;
 					if(current < amount) {
 						// Create the region name
-						String counterName = counter + "";
-						int minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
-						while(counterName.length() < minimumLength) {
-							counterName = "0" + counterName;
-						}
-						String regionName;
-						if(nameTemplate.contains("#")) {
-							regionName = nameTemplate.replace("#", counterName);
-						} else {
-							regionName = nameTemplate + counterName;
-						}
+						String regionName = countToName(nameTemplate, counter);
 						while(manager.getRegion(regionName) != null || AreaShop.getInstance().getFileManager().getRegion(regionName) != null) {
 							counter++;
-							counterName = counter + "";
-							minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
-							while(counterName.length() < minimumLength) {
-								counterName = "0" + counterName;
-							}
-							if(nameTemplate.contains("#")) {
-								regionName = nameTemplate.replace("#", counterName);
-							} else {
-								regionName = nameTemplate + counterName;
-							}
+							regionName = countToName(nameTemplate, counter);
 						}
+
 						// Add the region to WorldGuard (at startposition shifted by the number of this region times the blocks it should shift)
 						Vector minimum = minimumVector.clone().add(finalShift.clone().multiply(current));
 						Vector maximum = maximumVector.clone().add(finalShift.clone().multiply(current));
+
 						// Check for out of bounds
 						if(minimum.getBlockY() < 0) {
 							tooLow++;
@@ -194,28 +178,26 @@ public class StackCommand extends CommandAreaShop {
 						}
 						ProtectedCuboidRegion region = plugin.getWorldGuardHandler().createCuboidRegion(regionName, minimum,maximum);
 						manager.addRegion(region);
+
 						// Add the region to AreaShop
+						GeneralRegion newRegion;
 						if(rentRegions) {
-							RentRegion rent = new RentRegion(regionName, selection.getWorld());
-							if(finalGroup != null) {
-								finalGroup.addMember(rent);
-							}
-							rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
-							plugin.getFileManager().addRent(rent);
-							rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-							rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-							rent.update();
+							newRegion = new RentRegion(regionName, selection.getWorld());
+
 						} else {
-							BuyRegion buy = new BuyRegion(regionName, selection.getWorld());
-							if(finalGroup != null) {
-								finalGroup.addMember(buy);
-							}
-							buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
-							plugin.getFileManager().addBuy(buy);
-							buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-							buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-							buy.update();
+							newRegion = new BuyRegion(regionName, selection.getWorld());
 						}
+
+						if(finalGroup != null) {
+							finalGroup.addMember(newRegion);
+						}
+						AddingRegionEvent event = plugin.getFileManager().addRegion(newRegion);
+						if (event.isCancelled()) {
+							plugin.message(player, "general-cancelled", event.getReason());
+							continue;
+						}
+						newRegion.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+						newRegion.update();
 					}
 				}
 				if(current >= amount) {
@@ -236,6 +218,26 @@ public class StackCommand extends CommandAreaShop {
 		}.runTaskTimer(plugin, 1, 1);
 	}

+	/**
+	 * Build a name from a count, with the right length.
+	 * @param template Template to put the name in (# to put the count there, otherwise count is appended)
+	 * @param count Number to use
+	 * @return name with prepended 0's
+	 */
+	private String countToName(String template, int count) {
+		StringBuilder counterName =  new StringBuilder().append(count);
+		int minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
+		while(counterName.length() < minimumLength) {
+			counterName.insert(0, "0");
+		}
+
+		if(template.contains("#")) {
+			return template.replace("#", counterName);
+		} else {
+			return template + counterName;
+		}
+	}
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
@@ -59,12 +59,13 @@ public class TeleportCommand extends CommandAreaShop {
 			plugin.message(player, "teleport-noRentOrBuy", args[1]);
 			return;
 		}
-		if(args.length >= 3 && (args[2].equalsIgnoreCase("sign") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
-			region.getTeleportFeature().teleportPlayer(player, true);
-		} else {
-			region.getTeleportFeature().teleportPlayer(player, false);
-		}

+		boolean toSign = args.length >= 3 && (
+				args[2].equalsIgnoreCase("sign")
+						|| args[2].equalsIgnoreCase("yes")
+						|| args[2].equalsIgnoreCase("true")
+		);
+		region.getTeleportFeature().teleportPlayer(player, toSign, true);
 	}

 	@Override
@@ -16,6 +16,7 @@ public class RegionEvent<T> extends Event {
 		return handlers;
 	}

+	// Required by Bukkit/Spigot
 	public static HandlerList getHandlerList() {
 		return handlers;
 	}
@@ -0,0 +1,19 @@
+package me.wiefferink.areashop.events.ask;
+
+import me.wiefferink.areashop.events.CancellableRegionEvent;
+import me.wiefferink.areashop.regions.GeneralRegion;
+
+/**
+ * Broadcasted when a region has been added to AreaShop.
+ */
+public class AddingRegionEvent extends CancellableRegionEvent<GeneralRegion> {
+
+	/**
+	 * Constructor.
+	 * @param region The region that has been added
+	 */
+	public AddingRegionEvent(GeneralRegion region) {
+		super(region);
+	}
+
+}
@@ -0,0 +1,19 @@
+package me.wiefferink.areashop.events.ask;
+
+import me.wiefferink.areashop.events.CancellableRegionEvent;
+import me.wiefferink.areashop.regions.GeneralRegion;
+
+/**
+ * Broadcasted when a region has been added to AreaShop.
+ */
+public class DeletingRegionEvent extends CancellableRegionEvent<GeneralRegion> {
+
+	/**
+	 * Constructor.
+	 * @param region The region that has been added
+	 */
+	public DeletingRegionEvent(GeneralRegion region) {
+		super(region);
+	}
+
+}
@@ -0,0 +1,118 @@
+package me.wiefferink.areashop.features;
+
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
+import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
+import me.wiefferink.areashop.events.ask.RentingRegionEvent;
+import me.wiefferink.areashop.events.ask.ResellingRegionEvent;
+import me.wiefferink.areashop.events.ask.SellingRegionEvent;
+import me.wiefferink.areashop.events.ask.UnrentingRegionEvent;
+import me.wiefferink.areashop.events.notify.AddedRegionEvent;
+import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
+import me.wiefferink.areashop.events.notify.DeletedRegionEvent;
+import me.wiefferink.areashop.events.notify.RentedRegionEvent;
+import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
+import me.wiefferink.areashop.events.notify.SoldRegionEvent;
+import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import java.util.List;
+
+public class CommandsFeature extends RegionFeature {
+
+	/**
+	 * Run command for a certain event.
+	 * @param region Region to execute the events for
+	 * @param event The event
+	 * @param before The 'before' or 'after' commands
+	 */
+	public void runEventCommands(GeneralRegion region, GeneralRegion.RegionEvent event, boolean before) {
+		ConfigurationSection eventCommandProfileSection = region.getConfigurationSectionSetting("general.eventCommandProfile", "eventCommandProfiles");
+		if(eventCommandProfileSection == null) {
+			return;
+		}
+		List<String> commands = eventCommandProfileSection.getStringList(event.getValue() + "." + (before ? "before" : "after"));
+		if(commands == null || commands.isEmpty()) {
+			return;
+		}
+		region.runCommands(Bukkit.getConsoleSender(), commands);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void addingRegion(AddingRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.CREATED, true);
+	}
+
+	@EventHandler
+	public void addedRegion(AddedRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.CREATED, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void deletingRegion(DeletingRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.DELETED, true);
+	}
+
+	@EventHandler
+	public void deletedRegion(DeletedRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.DELETED, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void rentingRegion(RentingRegionEvent event) {
+		// Technically the rent can still be cancelled if the payment fails...
+		runEventCommands(event.getRegion(), event.isExtending() ? GeneralRegion.RegionEvent.EXTENDED : GeneralRegion.RegionEvent.RENTED, true);
+	}
+
+	@EventHandler
+	public void rentedRegion(RentedRegionEvent event) {
+		runEventCommands(event.getRegion(), event.hasExtended() ? GeneralRegion.RegionEvent.EXTENDED : GeneralRegion.RegionEvent.RENTED, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void buyingRegion(BuyingRegionEvent event) {
+		// Technically the buy can still be cancelled if the payment fails...
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.BOUGHT, true);
+	}
+
+	@EventHandler
+	public void boughtRegion(BoughtRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.BOUGHT, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void resellingRegion(ResellingRegionEvent event) {
+		// Technically the resell can still be cancelled if the payment fails...
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.RESELL, true);
+	}
+
+	@EventHandler
+	public void resoldRegion(ResoldRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.RESELL, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void sellingRegion(SellingRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.SOLD, true);
+	}
+
+	@EventHandler
+	public void soldRegion(SoldRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.SOLD, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void unrentingRegion(UnrentingRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.UNRENTED, true);
+	}
+
+	@EventHandler
+	public void unrentedRegion(UnrentedRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.UNRENTED, false);
+	}
+
+}
@@ -92,7 +92,7 @@ public class FriendsFeature extends RegionFeature {
 		HashSet<String> result = new HashSet<>();
 		for(UUID friend : getFriends()) {
 			OfflinePlayer player = Bukkit.getOfflinePlayer(friend);
-			if(player != null && player.getName() != null) {
+			if(player.hasPlayedBefore() && player.getName() != null) {
 				result.add(player.getName());
 			}
 		}
@@ -6,10 +6,31 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;

+/*
+Possible future feature classes:
+- RestrictedToRegion feature
+	- rent/buy restricted to the region itself
+- RestrictedToWorld feature
+	- rent/buy restricted to the world of the region
+- CountLimitsFeature:
+	- Check region limits
+- TimeLimitsFeatures:
+	- maxExtends
+	- maxRentTime
+- SchematicFeature
+	- save/load schematics
+- CommandsFeature
+	- execute commands after extend/rent/etc
+- LandlordFeature
+	- manage landlords
+- ExpirationWarningsFeature
+	- sending rental expiration warnings
+ */
+
 public abstract class RegionFeature implements Listener {
 	public static final AreaShop plugin = AreaShop.getInstance();

-	public YamlConfiguration config = plugin.getConfig();
+	protected YamlConfiguration config = plugin.getConfig();
 	private GeneralRegion region;

 	/**
@@ -42,7 +42,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		// Region flags for all states
 		ConfigurationSection allFlags = flagProfileSection.getConfigurationSection("ALL");
 		if(allFlags != null) {
-			result = result && updateRegionFlags(region, allFlags);
+			result = updateRegionFlags(region, allFlags);
 		}

 		// Region flags for the current state
@@ -52,9 +52,8 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		if(stateFlags == null && region.getState() == GeneralRegion.RegionState.RESELL) {
 			stateFlags = flagProfileSection.getConfigurationSection("resale");
 		}
-
 		if(stateFlags != null) {
-			result = result && updateRegionFlags(region, stateFlags);
+			result &= updateRegionFlags(region, stateFlags);
 		}

 		return result;
@@ -256,7 +255,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		result = result.replace("&1", "&B");
 		result = result.replace("&d", "&p");
 		result = result.replace("&5", "&P");
-		result = result.replace("&0", "&0");
+		//result = result.replace("&0", "&0");
 		result = result.replace("&8", "&1");
 		result = result.replace("&7", "&2");
 		result = result.replace("&f", "&w");
@@ -1,7 +1,11 @@
 package me.wiefferink.areashop.features.signs;

 import com.google.common.base.Objects;
+import io.papermc.lib.PaperLib;
+import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.managers.SignErrorLogger;
+import me.wiefferink.areashop.interfaces.BlockBehaviourHelper;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
@@ -9,251 +13,319 @@ import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Tag;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.WallSign;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;

 /**
 * Sign that is connected to a region to display information and interact with the region.
 */
 public class RegionSign {

-	private final SignsFeature signsFeature;
-	private final String key;

-	public RegionSign(SignsFeature signsFeature, String key) {
-		this.signsFeature = signsFeature;
-		this.key = key;
-	}
+    public static final BlockBehaviourHelper behaviourHelper = AreaShop.getInstance().getNMSHelper().behaviourHelper();
+    public static Level invalidSignLogLevel;
+    public static boolean removeInvalidSigns;

-	/**
-	 * Get the location of this sign.
-	 * @return The location of this sign
-	 */
-	public Location getLocation() {
-		return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
-	}
+    static {
+        YamlConfiguration configuration = AreaShop.getInstance().getConfig();
+        removeInvalidSigns = configuration.getBoolean("signs.removeInvalid");
+        final String rawLogLevel = configuration.getString("signs.invalidSignLogLevel", "WARNING");
+        try {
+            assert rawLogLevel != null;
+            invalidSignLogLevel = Level.parse(rawLogLevel);
+        } catch (IllegalArgumentException ex) {
+            AreaShop.warn("Invalid Logging Level: " + rawLogLevel);
+            invalidSignLogLevel = Level.WARNING;
+        }
+    }

-	/**
-	 * Location string to be used as key in maps.
-	 * @return Location string
-	 */
-	public String getStringLocation() {
-		return SignsFeature.locationToString(getLocation());
-	}

-	/**
-	 * Chunk string to be used as key in maps.
-	 * @return Chunk string
-	 */
-	public String getStringChunk() {
-		return SignsFeature.chunkToString(getLocation());
-	}
+    private static boolean canLogSignError() {
+        return AreaShop.getInstance().getLogger().isLoggable(invalidSignLogLevel);
+    }

-	/**
-	 * Get the region this sign is linked to.
-	 * @return The region this sign is linked to
-	 */
-	public GeneralRegion getRegion() {
-		return signsFeature.getRegion();
-	}
+    private static void logSignError(String... messages) {
+        if (invalidSignLogLevel == Level.OFF) {
+            return;
+        }
+        if (invalidSignLogLevel == Level.SEVERE) {
+            AreaShop.error((Object) messages);
+        } else if (invalidSignLogLevel == Level.WARNING) {
+            AreaShop.warn((Object) messages);
+        } else if (invalidSignLogLevel.intValue() >= Level.FINE.intValue()) {
+            AreaShop.debug((Object) messages);
+        } else {
+            AreaShop.info((Object) messages);
+        }
+    }

-	/**
-	 * Remove this sign from the region.
-	 */
-	public void remove() {
-		getLocation().getBlock().setType(Material.AIR);
-		signsFeature.getSignsRef().remove(getStringLocation());
-		SignsFeature.getAllSigns().remove(getStringLocation());
-		SignsFeature.getSignsByChunk().get(getStringChunk()).remove(this);
-		getRegion().setSetting("general.signs." + key, null);
-	}
+    private final SignsFeature signsFeature;
+    private final String key;

-	/**
-	 * Get the ConfigurationSection defining the sign layout.
-	 * @return The sign layout config
-	 */
-	public ConfigurationSection getProfile() {
-		return getRegion().getConfigurationSectionSetting("general.signProfile", "signProfiles", getRegion().getConfig().get("general.signs." + key + ".profile"));
-	}
+    public RegionSign(SignsFeature signsFeature, String key) {
+        this.signsFeature = signsFeature;
+        this.key = key;
+    }

-	/**
-	 * Get the facing of the sign.
-	 * @return BlockFace the sign faces, or null if unknown
-	 */
-	public BlockFace getFacing() {
-		try {
-			return BlockFace.valueOf(getRegion().getConfig().getString("general.signs." + key + ".facing"));
-		} catch(NullPointerException | IllegalArgumentException e) {
-			return null;
-		}
-	}
+    /**
+     * Get the location of this sign.
+     *
+     * @return The location of this sign
+     */
+    public Location getLocation() {
+        return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
+    }

-	/**
-	 * Get the material of the sign
-	 * @return Material of the sign, normally {@link Material#WALL_SIGN} or {@link Material#SIGN_POST}, but could be something else or null.
-	 */
-	public Material getMaterial() {
-		String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
-		if ("WALL_SIGN".equals(name)) {
-			return Materials.wallSign;
-		} else if ("SIGN_POST".equals(name) || "SIGN".equals(name)) {
-			return Materials.floorSign;
-		}
-		return null;
-	}
+    /**
+     * Location string to be used as key in maps.
+     *
+     * @return Location string
+     */
+    public String getStringLocation() {
+        return SignsFeature.locationToString(getLocation());
+    }

-	/**
-	 * Update this sign.
-	 * @return true if the update was successful, otherwise false
-	 */
-	public boolean update() {
-		// Ignore updates of signs in chunks that are not loaded
-		Location signLocation = getLocation();
-		if(signLocation == null
-				|| signLocation.getWorld() == null
-				|| !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
-			return false;
-		}
+    /**
+     * Chunk string to be used as key in maps.
+     *
+     * @return Chunk string
+     */
+    public String getStringChunk() {
+        return SignsFeature.chunkToString(getLocation());
+    }

-		if(getRegion().isDeleted()) {
-			return false;
-		}
+    /**
+     * Get the region this sign is linked to.
+     *
+     * @return The region this sign is linked to
+     */
+    public GeneralRegion getRegion() {
+        return signsFeature.getRegion();
+    }

-		YamlConfiguration regionConfig = getRegion().getConfig();
-		ConfigurationSection signConfig = getProfile();
-		Block block = signLocation.getBlock();
-		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue())) {
-			block.setType(Material.AIR);
-			return true;
-		}
+    /**
+     * Remove this sign from the region.
+     */
+    public void remove() {
+        getLocation().getBlock().setType(Material.AIR);
+        signsFeature.getSignsRef().remove(getStringLocation());
+        SignsFeature.getAllSigns().remove(getStringLocation());
+        SignsFeature.getSignsByChunk().get(getStringChunk()).remove(this);
+        getRegion().setSetting("general.signs." + key, null);
+    }

-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
+    /**
+     * Get the ConfigurationSection defining the sign layout.
+     *
+     * @return The sign layout config
+     */
+    public ConfigurationSection getProfile() {
+        return getRegion().getConfigurationSectionSetting("general.signProfile", "signProfiles", getRegion().getConfig().get("general.signs." + key + ".profile"));
+    }

-		// Get the lines
-		String[] signLines = new String[4];
-		boolean signEmpty = true;
-		for(int i = 0; i < 4; i++) {
-			signLines[i] = stateConfig.getString("line" + (i + 1));
-			signEmpty &= (signLines[i] == null || signLines[i].isEmpty());
-		}
-		if(signEmpty) {
-			block.setType(Material.AIR);
-			return true;
-		}
+    /**
+     * Get the facing of the sign as saved in the config.
+     *
+     * @return BlockFace the sign faces, or null if unknown
+     */
+    public BlockFace getFacing() {
+        try {
+            return BlockFace.valueOf(getRegion().getConfig().getString("general.signs." + key + ".facing"));
+        } catch (NullPointerException | IllegalArgumentException e) {
+            return null;
+        }
+    }

-		// Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
-		Sign signState = null;
-		if(!Materials.isSign(block.getType())) {
-			Material signType = getMaterial();
-			block.setType(signType);
-			if(!Materials.isSign(block.getType())) {
-				AreaShop.debug("Setting sign", key, "of region", getRegion().getName(), "failed, could not set sign block back");
-				return false;
-			}
-			signState = (Sign) block.getState();
-			org.bukkit.material.Sign signData = (org.bukkit.material.Sign)signState.getData();
-			BlockFace signFace = getFacing();
-			if(signFace != null) {
-				signData.setFacingDirection(signFace);
-				signState.setData(signData);
-			}
-		}
-		if(signState == null) {
-			signState = (Sign) block.getState();
-		}
+    /**
+     * Get the material of the sign as saved in the config.
+     *
+     * @return Material of the sign, usually, a sign or {@link Material#AIR} if none.
+     */
+    public Material getMaterial() {
+        String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
+        Material result = Materials.signNameToMaterial(name);
+        return result == null ? Material.AIR : result;
+    }

-		// Save current rotation and type
-		org.bukkit.material.Sign signData = (org.bukkit.material.Sign)signState.getData();
-		if(!regionConfig.isString("general.signs." + key + ".signType")) {
-			String signType = signState.getType().name();
-			if (signType.equals("SIGN")) {
-				signType = "SIGN_POST"; // Save with a backwards-compatible name
-			}
-			getRegion().setSetting("general.signs." + key + ".signType", signType);
-		}
-		if(!regionConfig.isString("general.signs." + key + ".facing")) {
-			getRegion().setSetting("general.signs." + key + ".facing", signData.getFacing().toString());
-		}
+    /**
+     * Update this sign.
+     *
+     * @return true if the update was successful, otherwise false
+     */
+    public boolean update() {
+        // Ignore updates of signs in chunks that are not loaded
+        Location signLocation = getLocation();
+        if (signLocation == null
+                || signLocation.getWorld() == null
+                || !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
+            return false;
+        }

-		// Apply replacements and color and then set it on the sign
-		for(int i = 0; i < signLines.length; i++) {
-			if(signLines[i] == null) {
-				signState.setLine(i, "");
-				continue;
-			}
-			signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
-			signLines[i] = Utils.applyColors(signLines[i]);
-			signState.setLine(i, signLines[i]);
-		}
-		signState.update();
-		return true;
-	}
+        if (getRegion().isDeleted()) {
+            return false;
+        }

-	/**
-	 * Check if the sign needs to update periodically.
-	 * @return true if it needs periodic updates, otherwise false
-	 */
-	public boolean needsPeriodicUpdate() {
-		ConfigurationSection signConfig = getProfile();
-		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
-			return false;
-		}
-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
-		// Check the lines for the timeleft tag
-		for(int i = 1; i <= 4; i++) {
-			String line = stateConfig.getString("line" + i);
-			if(line != null && !line.isEmpty() && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
-				return true;
-			}
-		}
-		return false;
-	}
+        YamlConfiguration regionConfig = getRegion().getConfig();
+        ConfigurationSection signConfig = getProfile();
+        Block block = signLocation.getBlock();
+        if (signConfig == null || !signConfig.isSet(getRegion().getState().getValue())) {
+            block.setType(Material.AIR);
+            return true;
+        }

-	/**
-	 * Run commands when a player clicks a sign.
-	 * @param clicker   The player that clicked the sign
-	 * @param clickType The type of clicking
-	 * @return true if the commands ran successfully, false if any of them failed
-	 */
-	public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
-		ConfigurationSection signConfig = getProfile();
-		if(signConfig == null) {
-			return false;
-		}
-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
+        assert stateConfig != null;
+        // Get the lines
+        String[] signLines = new String[4];
+        boolean signEmpty = true;
+        for (int i = 0; i < 4; i++) {
+            signLines[i] = stateConfig.getString("line" + (i + 1));
+            signEmpty &= (signLines[i] == null || signLines[i].isEmpty());
+        }
+        if (signEmpty) {
+            block.setType(Material.AIR);
+            return true;
+        }
+        final BlockStateSnapshotResult snapshot = PaperLib.getBlockState(block, false);
+        final BlockState blockState = snapshot.getState();
+        final BlockData blockData = blockState.getBlockData();
+        final SignErrorLogger errorLogger = AreaShop.getInstance().getSignErrorLogger();
+        Material signType = getMaterial();
+        // Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
+        if (!Materials.isSign(blockState.getType())) {
+            // Don't do physics here, we first need to update the direction
+            blockState.setType(signType);
+            if (blockData instanceof WallSign) {
+                ((WallSign) blockData).setFacing(getFacing());
+            } else if (blockData instanceof Sign) {
+                ((org.bukkit.block.data.type.Sign) blockData).setRotation(getFacing());
+            }
+            blockState.setBlockData(blockData);
+            blockState.update(false, true);
+            // Check if the sign has popped
+            if (!Materials.isSign(block.getType())) {
+                final String message = String.format("Setting sign of $1%s of region $2%s failed, could not set sign block back", key, getRegion().getName());
+                errorLogger.submitWarning(message);
+                return false;
+            }
+        } else {
+            final String message = "Setting sign $1%s of region $2%s failed, RegionSign material was: $3%s";
+            errorLogger.submitWarning(String.format(message, key, getRegion().getName(), signType.name()));
+        }

-		// Run player commands if specified
-		List<String> playerCommands = new ArrayList<>();
-		for(String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
-			// TODO move variable checking code to InteractiveMessenger?
-			playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
-		}
-		getRegion().runCommands(clicker, playerCommands);
+        // Save current rotation and type
+        if (!regionConfig.isString("general.signs." + key + ".signType")) {
+            getRegion().setSetting("general.signs." + key + ".signType", block.getType().name());
+        }
+        if (!regionConfig.isString("general.signs." + key + ".facing")) {
+            final BlockFace rotation;
+            if (Materials.isSign(block.getType())) {
+                BlockData data = blockState.getBlockData();
+                if (data instanceof org.bukkit.block.data.type.Sign) {
+                    rotation = ((org.bukkit.block.data.type.Sign) block.getBlockData()).getRotation();
+                } else if (data instanceof WallSign) {
+                    rotation = ((WallSign) data).getFacing();
+                } else {
+                    rotation = null;
+                }
+            } else {
+                rotation = null;
+            }
+            getRegion().setSetting("general.signs." + key + ".facing", rotation == null ? null : rotation.toString());
+        }

-		// Run console commands if specified
-		List<String> consoleCommands = new ArrayList<>();
-		for(String command : stateConfig.getStringList(clickType.getValue() + "Console")) {
-			consoleCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
-		}
-		getRegion().runCommands(Bukkit.getConsoleSender(), consoleCommands);
+        // Apply replacements and color and then set it on the sign
+        Sign signState = (Sign) blockState;
+        for (int i = 0; i < signLines.length; i++) {
+            if (signLines[i] == null) {
+                signState.setLine(i, "");
+                continue;
+            }
+            signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
+            signLines[i] = Utils.applyColors(signLines[i]);
+            signState.setLine(i, signLines[i]);
+        }
+        // BlockState#update *should* return true here.
+        return blockState.update(true, false);
+    }

-		return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
-	}
+    /**
+     * Check if the sign needs to update periodically.
+     *
+     * @return true if it needs periodic updates, otherwise false
+     */
+    public boolean needsPeriodicUpdate() {
+        ConfigurationSection signConfig = getProfile();
+        if (signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
+            return false;
+        }

-	@Override
-	public boolean equals(Object object) {
-		return object instanceof RegionSign && ((RegionSign)object).getRegion().equals(this.getRegion()) && ((RegionSign)object).key.equals(this.key);
-	}
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+        if (stateConfig == null) {
+            return false;
+        }

-	@Override
-	public int hashCode() {
-		return Objects.hashCode(key, getRegion().getName());
-	}
+        // Check the lines for the timeleft tag
+        for (int i = 1; i <= 4; i++) {
+            String line = stateConfig.getString("line" + i);
+            if (line != null && !line.isEmpty() && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Run commands when a player clicks a sign.
+     *
+     * @param clicker   The player that clicked the sign
+     * @param clickType The type of clicking
+     * @return true if the commands ran successfully, false if any of them failed
+     */
+    public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
+        ConfigurationSection signConfig = getProfile();
+        if (signConfig == null) {
+            return false;
+        }
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+
+        // Run player commands if specified
+        List<String> playerCommands = new ArrayList<>();
+        for (String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
+            // TODO move variable checking code to InteractiveMessenger?
+            playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+        }
+        getRegion().runCommands(clicker, playerCommands);
+
+        // Run console commands if specified
+        List<String> consoleCommands = new ArrayList<>();
+        for (String command : stateConfig.getStringList(clickType.getValue() + "Console")) {
+            consoleCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+        }
+        getRegion().runCommands(Bukkit.getConsoleSender(), consoleCommands);
+
+        return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        return object instanceof RegionSign && ((RegionSign) object).getRegion().equals(this.getRegion()) && ((RegionSign) object).key.equals(this.key);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(key, getRegion().getName());
+    }
 }
@@ -0,0 +1,121 @@
+package me.wiefferink.areashop.features.signs;
+
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.ChunkLoadEvent;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SignCache implements Listener {
+
+    private final Map<String, RegionSign> allSigns = new HashMap<>();
+    private final Map<String, List<RegionSign>> signsByChunk = new HashMap<>();
+
+    public void registerListeners() {
+        Bukkit.getPluginManager().registerEvents(this, AreaShop.getInstance());
+    }
+
+    /**
+     * Convert a location to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a location
+     */
+    public static String locationToString(Location location) {
+        return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Location location) {
+        return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     * Use a Location argument to prevent chunk loading!
+     *
+     * @param chunk The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Chunk chunk) {
+        return chunk.getWorld().getName() + ";" + chunk.getX() + ";" + chunk.getZ();
+    }
+
+    /**
+     * Get a sign by a location.
+     *
+     * @param location The location to get the sign for
+     * @return The RegionSign that is at the location, or null if none
+     */
+    public RegionSign getSignByLocation(Location location) {
+        return allSigns.get(locationToString(location));
+    }
+
+    /**
+     * Get the map with all signs.
+     *
+     * @return Map with all signs: locationString -&gt; RegionSign
+     */
+    public Map<String, RegionSign> getAllSigns() {
+        return allSigns;
+    }
+
+    /**
+     * Get the map with signs by chunk.
+     *
+     * @return Map with signs by chunk: chunkString -&gt; List&lt;RegionSign&gt;
+     */
+    public Map<String, List<RegionSign>> getSignsByChunk() {
+        return signsByChunk;
+    }
+
+    public void addSign(RegionSign regionSign) {
+        signsByChunk.computeIfAbsent(regionSign.getStringChunk(), (unused) -> new ArrayList<>()).add(regionSign);
+    }
+
+    public void removeSign(RegionSign regionSign) {
+        final List<RegionSign> signs = signsByChunk.get(regionSign.getStringChunk());
+        if (signs != null) {
+            signs.remove(regionSign);
+        }
+        allSigns.remove(regionSign.getStringLocation());
+    }
+
+    public void shutdown() {
+        HandlerList.unregisterAll(this);
+        signsByChunk.clear();
+        allSigns.clear();
+    }
+
+    @EventHandler
+    public void regionUpdate(UpdateRegionEvent event) {
+        event.getRegion().getSignsFeature().update();
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onChunkLoad(ChunkLoadEvent event) {
+        List<RegionSign> chunkSigns = signsByChunk.get(chunkToString(event.getChunk()));
+        if (chunkSigns == null) {
+            return;
+        }
+        int batchSize = Math.max(chunkSigns.size() / 10, 10);
+        Utils.runAsBatches(chunkSigns, batchSize, RegionSign::update, false);
+    }
+
+}
@@ -1,769 +0,0 @@
-/*
- * Copyright 2011-2013 Tyler Blair. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and contributors and should not be interpreted as representing official policies,
- * either expressed or implied, of anybody else.
- */
-
-package me.wiefferink.areashop.lib;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.scheduler.BukkitTask;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Method;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-public class Metrics {
-
-	/**
-	 * The current revision number.
-	 */
-	private static final int REVISION = 7;
-
-	/**
-	 * The base url of the metrics domain.
-	 */
-	private static final String BASE_URL = "http://report.mcstats.org";
-
-	/**
-	 * The url used to report a server's status.
-	 */
-	private static final String REPORT_URL = "/plugin/%s";
-
-	/**
-	 * Interval of time to ping (in minutes).
-	 */
-	private static final int PING_INTERVAL = 15;
-
-	/**
-	 * The plugin this metrics submits for.
-	 */
-	private final Plugin plugin;
-
-	/**
-	 * All of the custom graphs to submit to metrics.
-	 */
-	private final Set<Graph> graphs = Collections.synchronizedSet(new HashSet<Graph>());
-
-	/**
-	 * The plugin configuration file.
-	 */
-	private final YamlConfiguration configuration;
-
-	/**
-	 * The plugin configuration file.
-	 */
-	private final File configurationFile;
-
-	/**
-	 * Unique server id.
-	 */
-	private final String guid;
-
-	/**
-	 * Debug mode.
-	 */
-	private final boolean debug;
-
-	/**
-	 * Lock for synchronization.
-	 */
-	private final Object optOutLock = new Object();
-
-	/**
-	 * The scheduled task.
-	 */
-	private volatile BukkitTask task = null;
-
-	/**
-	 * Constructor.
-	 * @param plugin The plugin to report stats for
-	 * @throws IOException When the plugin or configuration is wrong
-	 */
-	public Metrics(final Plugin plugin) throws IOException {
-		if(plugin == null) {
-			throw new IllegalArgumentException("Plugin cannot be null");
-		}
-
-		this.plugin = plugin;
-
-		// load the config
-		configurationFile = getConfigFile();
-		configuration = YamlConfiguration.loadConfiguration(configurationFile);
-
-		// add some defaults
-		configuration.addDefault("opt-out", false);
-		configuration.addDefault("guid", UUID.randomUUID().toString());
-		configuration.addDefault("debug", false);
-
-		// Do we need to create the file?
-		if(configuration.get("guid", null) == null) {
-			configuration.options().header("http://mcstats.org").copyDefaults(true);
-			configuration.save(configurationFile);
-		}
-
-		// Load the guid then
-		guid = configuration.getString("guid");
-		debug = configuration.getBoolean("debug", false);
-	}
-
-	/**
-	 * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics
-	 * website. Plotters can be added to the graph object returned.
-	 * @param name The name of the graph
-	 * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
-	 */
-	public Graph createGraph(final String name) {
-		if(name == null) {
-			throw new IllegalArgumentException("Graph name cannot be null");
-		}
-
-		// Construct the graph object
-		final Graph graph = new Graph(name);
-
-		// Now we can add our graph
-		graphs.add(graph);
-
-		// and return back
-		return graph;
-	}
-
-	/**
-	 * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend.
-	 * @param graph The name of the graph
-	 */
-	public void addGraph(final Graph graph) {
-		if(graph == null) {
-			throw new IllegalArgumentException("Graph cannot be null");
-		}
-
-		graphs.add(graph);
-	}
-
-	/**
-	 * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the
-	 * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200
-	 * ticks.
-	 * @return True if statistics measuring is running, otherwise false.
-	 */
-	public boolean start() {
-		synchronized(optOutLock) {
-			// Did we opt out?
-			if(isOptOut()) {
-				return false;
-			}
-
-			// Is metrics already running?
-			if(task != null) {
-				return true;
-			}
-
-			// Begin hitting the server with glorious data
-			task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
-
-				private boolean firstPost = true;
-
-				public void run() {
-					try {
-						// This has to be synchronized or it can collide with the disable method.
-						synchronized(optOutLock) {
-							// Disable Task, if it is running and the server owner decided to opt-out
-							if(isOptOut() && task != null) {
-								task.cancel();
-								task = null;
-								// Tell all plotters to stop gathering information.
-								for(Graph graph : graphs) {
-									graph.onOptOut();
-								}
-							}
-						}
-
-						// We use the inverse of firstPost because if it is the first time we are posting,
-						// it is not a interval ping, so it evaluates to FALSE
-						// Each time thereafter it will evaluate to TRUE, i.e PING!
-						postPlugin(!firstPost);
-
-						// After the first post we set firstPost to false
-						// Each post thereafter will be a ping
-						firstPost = false;
-					} catch(IOException e) {
-						if(debug) {
-							Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
-						}
-					}
-				}
-			}, 0, PING_INTERVAL * 1200);
-
-			return true;
-		}
-	}
-
-	/**
-	 * If the server owner denied plugin metrics.
-	 * @return true if metrics should be opted out of it
-	 */
-	public boolean isOptOut() {
-		synchronized(optOutLock) {
-			try {
-				// Reload the metrics file
-				configuration.load(getConfigFile());
-			} catch(IOException ex) {
-				if(debug) {
-					Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-				}
-				return true;
-			} catch(InvalidConfigurationException ex) {
-				if(debug) {
-					Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-				}
-				return true;
-			}
-			return configuration.getBoolean("opt-out", false);
-		}
-	}
-
-	/**
-	 * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
-	 * @throws IOException when saving the config file fails
-	 */
-	public void enable() throws IOException {
-		// This has to be synchronized or it can collide with the check in the task.
-		synchronized(optOutLock) {
-			// Check if the server owner has already set opt-out, if not, set it.
-			if(isOptOut()) {
-				configuration.set("opt-out", false);
-				configuration.save(configurationFile);
-			}
-
-			// Enable Task, if it is not running
-			if(task == null) {
-				start();
-			}
-		}
-	}
-
-	/**
-	 * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
-	 * @throws IOException when saving the config file fails
-	 */
-	public void disable() throws IOException {
-		// This has to be synchronized or it can collide with the check in the task.
-		synchronized(optOutLock) {
-			// Check if the server owner has already set opt-out, if not, set it.
-			if(!isOptOut()) {
-				configuration.set("opt-out", true);
-				configuration.save(configurationFile);
-			}
-
-			// Disable Task, if it is running
-			if(task != null) {
-				task.cancel();
-				task = null;
-			}
-		}
-	}
-
-	/**
-	 * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status.
-	 * @return the File object for the config file
-	 */
-	public File getConfigFile() {
-		// I believe the easiest way to get the base folder (e.g craftbukkit set via -P) for plugins to use
-		// is to abuse the plugin object we already have
-		// plugin.getDataFolder() => base/plugins/PluginA/
-		// pluginsFolder => base/plugins/
-		// The base is not necessarily relative to the startup directory.
-		File pluginsFolder = plugin.getDataFolder().getParentFile();
-
-		// return => base/plugins/PluginMetrics/config.yml
-		return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml");
-	}
-
-	/**
-	 * Gets the online player (backwards compatibility).
-	 * @return online player amount
-	 */
-	private int getOnlinePlayers() {
-		try {
-			Method onlinePlayerMethod = Server.class.getMethod("getOnlinePlayers");
-			if(onlinePlayerMethod.getReturnType().equals(Collection.class)) {
-				return ((Collection<?>)onlinePlayerMethod.invoke(Bukkit.getServer())).size();
-			} else {
-				return ((Player[])onlinePlayerMethod.invoke(Bukkit.getServer())).length;
-			}
-		} catch(Exception ex) {
-			if(debug) {
-				Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-			}
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Generic method that posts a plugin to the metrics website.
-	 */
-	private void postPlugin(final boolean isPing) throws IOException {
-		// Server software specific section
-		PluginDescriptionFile description = plugin.getDescription();
-		String pluginName = description.getName();
-		boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
-		String pluginVersion = description.getVersion();
-		String serverVersion = Bukkit.getVersion();
-		int playersOnline = this.getOnlinePlayers();
-
-		// END server software specific section -- all code below does not use any code outside of this class / Java
-
-		// Construct the post data
-		StringBuilder json = new StringBuilder(1024);
-		json.append('{');
-
-		// The plugin's description file containg all of the plugin data such as name, version, author, etc
-		appendJsonPair(json, "guid", guid);
-		appendJsonPair(json, "plugin_version", pluginVersion);
-		appendJsonPair(json, "server_version", serverVersion);
-		appendJsonPair(json, "players_online", Integer.toString(playersOnline));
-
-		// New data as of R6
-		String osname = System.getProperty("os.name");
-		String osarch = System.getProperty("os.arch");
-		String osversion = System.getProperty("os.version");
-		String javaVersion = System.getProperty("java.version");
-		int coreCount = Runtime.getRuntime().availableProcessors();
-
-		// normalize os arch .. amd64 -> x86_64
-		if(osarch.equals("amd64")) {
-			osarch = "x86_64";
-		}
-
-		appendJsonPair(json, "osname", osname);
-		appendJsonPair(json, "osarch", osarch);
-		appendJsonPair(json, "osversion", osversion);
-		appendJsonPair(json, "cores", Integer.toString(coreCount));
-		appendJsonPair(json, "auth_mode", onlineMode ? "1" : "0");
-		appendJsonPair(json, "java_version", javaVersion);
-
-		// If we're pinging, append it
-		if(isPing) {
-			appendJsonPair(json, "ping", "1");
-		}
-
-		if(graphs.size() > 0) {
-			synchronized(graphs) {
-				json.append(',');
-				json.append('"');
-				json.append("graphs");
-				json.append('"');
-				json.append(':');
-				json.append('{');
-
-				boolean firstGraph = true;
-
-				final Iterator<Graph> iter = graphs.iterator();
-
-				while(iter.hasNext()) {
-					Graph graph = iter.next();
-
-					StringBuilder graphJson = new StringBuilder();
-					graphJson.append('{');
-
-					for(Plotter plotter : graph.getPlotters()) {
-						appendJsonPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue()));
-					}
-
-					graphJson.append('}');
-
-					if(!firstGraph) {
-						json.append(',');
-					}
-
-					json.append(escapeJson(graph.getName()));
-					json.append(':');
-					json.append(graphJson);
-
-					firstGraph = false;
-				}
-
-				json.append('}');
-			}
-		}
-
-		// close json
-		json.append('}');
-
-		// Create the url
-		URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName)));
-
-		// Connect to the website
-		URLConnection connection;
-
-		// Mineshafter creates a socks proxy, so we can safely bypass it
-		// It does not reroute POST requests so we need to go around it
-		if(isMineshafterPresent()) {
-			connection = url.openConnection(Proxy.NO_PROXY);
-		} else {
-			connection = url.openConnection();
-		}
-
-
-		byte[] uncompressed = json.toString().getBytes();
-		byte[] compressed = gzip(json.toString());
-
-		// Headers
-		connection.addRequestProperty("User-Agent", "MCStats/" + REVISION);
-		connection.addRequestProperty("Content-Type", "application/json");
-		connection.addRequestProperty("Content-Encoding", "gzip");
-		connection.addRequestProperty("Content-Length", Integer.toString(compressed.length));
-		connection.addRequestProperty("Accept", "application/json");
-		connection.addRequestProperty("Connection", "close");
-
-		connection.setDoOutput(true);
-
-		if(debug) {
-			System.out.println("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length);
-		}
-
-		// Write the data
-		OutputStream os = connection.getOutputStream();
-		os.write(compressed);
-		os.flush();
-
-		// Now read the response
-		final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-		String response = reader.readLine();
-
-		// close resources
-		os.close();
-		reader.close();
-
-		if(response == null || response.startsWith("ERR") || response.startsWith("7")) {
-			if(response == null) {
-				response = "null";
-			} else if(response.startsWith("7")) {
-				response = response.substring(response.startsWith("7,") ? 2 : 1);
-			}
-
-			throw new IOException(response);
-		} else {
-			// Is this the first update this hour?
-			if(response.equals("1") || response.contains("This is your first update this hour")) {
-				synchronized(graphs) {
-					final Iterator<Graph> iter = graphs.iterator();
-
-					while(iter.hasNext()) {
-						final Graph graph = iter.next();
-
-						for(Plotter plotter : graph.getPlotters()) {
-							plotter.reset();
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * GZip compress a string of bytes.
-	 * @param input Content to gzip
-	 * @return byte[] of the gzipped input
-	 */
-	public static byte[] gzip(String input) {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		GZIPOutputStream gzos = null;
-
-		try {
-			gzos = new GZIPOutputStream(baos);
-			gzos.write(input.getBytes(StandardCharsets.UTF_8));
-		} catch(IOException e) {
-			e.printStackTrace();
-		} finally {
-			if(gzos != null) {
-				try {
-					gzos.close();
-				} catch(IOException ignore) {
-					// ignore
-				}
-			}
-		}
-
-		return baos.toByteArray();
-	}
-
-	/**
-	 * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
-	 * @return true if mineshafter is installed on the server
-	 */
-	private boolean isMineshafterPresent() {
-		try {
-			Class.forName("mineshafter.MineServer");
-			return true;
-		} catch(Exception e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Appends a json encoded key/value pair to the given string builder.
-	 */
-	private static void appendJsonPair(StringBuilder json, String key, String value) throws UnsupportedEncodingException {
-		boolean isValueNumeric = false;
-
-		try {
-			if(value.equals("0") || !value.endsWith("0")) {
-				Double.parseDouble(value);
-				isValueNumeric = true;
-			}
-		} catch(NumberFormatException e) {
-			isValueNumeric = false;
-		}
-
-		if(json.charAt(json.length() - 1) != '{') {
-			json.append(',');
-		}
-
-		json.append(escapeJson(key));
-		json.append(':');
-
-		if(isValueNumeric) {
-			json.append(value);
-		} else {
-			json.append(escapeJson(value));
-		}
-	}
-
-	/**
-	 * Escape a string to create a valid JSON string.
-	 */
-	private static String escapeJson(String text) {
-		StringBuilder builder = new StringBuilder();
-
-		builder.append('"');
-		for(int index = 0; index < text.length(); index++) {
-			char chr = text.charAt(index);
-
-			switch(chr) {
-				case '"':
-				case '\\':
-					builder.append('\\');
-					builder.append(chr);
-					break;
-				case '\b':
-					builder.append("\\b");
-					break;
-				case '\t':
-					builder.append("\\t");
-					break;
-				case '\n':
-					builder.append("\\n");
-					break;
-				case '\r':
-					builder.append("\\r");
-					break;
-				default:
-					if(chr < ' ') {
-						String t = "000" + Integer.toHexString(chr);
-						builder.append("\\u" + t.substring(t.length() - 4));
-					} else {
-						builder.append(chr);
-					}
-					break;
-			}
-		}
-		builder.append('"');
-
-		return builder.toString();
-	}
-
-	/**
-	 * Encode text as UTF-8.
-	 * @param text the text to encode
-	 * @return the encoded text, as UTF-8
-	 */
-	private static String urlEncode(final String text) throws UnsupportedEncodingException {
-		return URLEncoder.encode(text, "UTF-8");
-	}
-
-	/**
-	 * Represents a custom graph on the website.
-	 */
-	public static class Graph {
-
-		/**
-		 * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
-		 * rejected.
-		 */
-		private final String name;
-
-		/**
-		 * The set of plotters that are contained within this graph.
-		 */
-		private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
-
-		private Graph(final String name) {
-			this.name = name;
-		}
-
-		/**
-		 * Gets the graph's name.
-		 * @return the Graph's name
-		 */
-		public String getName() {
-			return name;
-		}
-
-		/**
-		 * Add a plotter to the graph, which will be used to plot entries.
-		 * @param plotter the plotter to add to the graph
-		 */
-		public void addPlotter(final Plotter plotter) {
-			plotters.add(plotter);
-		}
-
-		/**
-		 * Remove a plotter from the graph.
-		 * @param plotter the plotter to remove from the graph
-		 */
-		public void removePlotter(final Plotter plotter) {
-			plotters.remove(plotter);
-		}
-
-		/**
-		 * Gets an <b>unmodifiable</b> set of the plotter objects in the graph.
-		 * @return an unmodifiable {@link java.util.Set} of the plotter objects
-		 */
-		public Set<Plotter> getPlotters() {
-			return Collections.unmodifiableSet(plotters);
-		}
-
-		@Override
-		public int hashCode() {
-			return name.hashCode();
-		}
-
-		@Override
-		public boolean equals(final Object object) {
-			if(!(object instanceof Graph)) {
-				return false;
-			}
-
-			final Graph graph = (Graph)object;
-			return graph.name.equals(name);
-		}
-
-		/**
-		 * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
-		 */
-		protected void onOptOut() {
-		}
-	}
-
-	/**
-	 * Interface used to collect custom data for a plugin.
-	 */
-	public abstract static class Plotter {
-
-		/**
-		 * The plot's name.
-		 */
-		private final String name;
-
-		/**
-		 * Construct a plotter with the default plot name.
-		 */
-		public Plotter() {
-			this("Default");
-		}
-
-		/**
-		 * Construct a plotter with a specific plot name.
-		 * @param name the name of the plotter to use, which will show up on the website
-		 */
-		public Plotter(final String name) {
-			this.name = name;
-		}
-
-		/**
-		 * Get the current value for the plotted point. Since this function defers to an external function it may or may
-		 * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called
-		 * from any thread so care should be taken when accessing resources that need to be synchronized.
-		 * @return the current value for the point to be plotted.
-		 */
-		public abstract int getValue();
-
-		/**
-		 * Get the column name for the plotted point.
-		 * @return the plotted point's column name
-		 */
-		public String getColumnName() {
-			return name;
-		}
-
-		/**
-		 * Called after the website graphs have been updated.
-		 */
-		public void reset() {
-		}
-
-		@Override
-		public int hashCode() {
-			return getColumnName().hashCode();
-		}
-
-		@Override
-		public boolean equals(final Object object) {
-			if(!(object instanceof Plotter)) {
-				return false;
-			}
-
-			final Plotter plotter = (Plotter)object;
-			return plotter.name.equals(name) && plotter.getValue() == getValue();
-		}
-	}
-}
@@ -5,7 +5,6 @@ import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
-import me.wiefferink.bukkitdo.Do;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -22,112 +21,109 @@ import java.util.List;
 * Notify region expiry and track activity time.
 */
 public final class PlayerLoginLogoutListener implements Listener {
-	private final AreaShop plugin;
+    private final AreaShop plugin;

-	/**
-	 * Constructor.
-	 * @param plugin The AreaShop plugin
-	 */
-	public PlayerLoginLogoutListener(AreaShop plugin) {
-		this.plugin = plugin;
-	}
+    /**
+     * Constructor.
+     *
+     * @param plugin The AreaShop plugin
+     */
+    public PlayerLoginLogoutListener(AreaShop plugin) {
+        this.plugin = plugin;
+    }

-	/**
-	 * Called when a sign is changed.
-	 * @param event The event
-	 */
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerLogin(PlayerLoginEvent event) {
-		if(event.getResult() != Result.ALLOWED) {
-			return;
-		}
-		final Player player = event.getPlayer();
+    /**
+     * Called when a sign is changed.
+     *
+     * @param event The event
+     */
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        if (event.getResult() != Result.ALLOWED) {
+            return;
+        }
+        final Player player = event.getPlayer();

-		// Schedule task to check for notifications, prevents a lag spike at login
-		Do.syncTimerLater(25, 25, () -> {
-			// Delay until all regions are loaded
-			if(!plugin.isReady()) {
-				return true;
-			}
-			if(!player.isOnline()) {
-				return false;
-			}
-			// Notify for rents that almost run out
-			for(RentRegion region : plugin.getFileManager().getRents()) {
-				if(region.isRenter(player)) {
-					String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
-					if(warningSetting == null || warningSetting.isEmpty()) {
-						continue;
-					}
-					long warningTime = Utils.durationStringToLong(warningSetting);
-					if(region.getTimeLeft() < warningTime) {
-						// Send the warning message later to let it appear after general MOTD messages
-						AreaShop.getInstance().message(player, "rent-expireWarning", region);
-					}
-				}
-			}
+        // Schedule task to check for notifications, prevents a lag spike at login
+        Utils.runCancellingTaskTimer(() -> {
+            // Delay until all regions are loaded
+            if (!plugin.isReady()) {
+                return true;
+            }
+            if (!player.isOnline()) {
+                return false;
+            }
+            // Notify for rents that almost run out
+            for (RentRegion region : plugin.getFileManager().getRents()) {
+                if (region.isRenter(player)) {
+                    String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
+                    if (warningSetting == null || warningSetting.isEmpty()) {
+                        continue;
+                    }
+                    long warningTime = Utils.durationStringToLong(warningSetting);
+                    if (region.getTimeLeft() < warningTime) {
+                        // Send the warning message later to let it appear after general MOTD messages
+                        AreaShop.getInstance().message(player, "rent-expireWarning", region);
+                    }
+                }
+            }

-			// Notify admins for plugin updates
-			AreaShop.getInstance().notifyUpdate(player);
-			return false;
-		});
+            // Notify admins for plugin updates
+            AreaShop.getInstance().notifyUpdate(player);
+            return false;
+        }, 25, 25, false);

-		// Check if the player has regions that use an old name of him and update them
-		Do.syncTimerLater(22, 10, () -> {
-			if(!plugin.isReady()) {
-				return true;
-			}
+        // Check if the player has regions that use an old name of him and update them
+        Utils.runCancellingTaskTimer(() -> {
+            if (!plugin.isReady()) {
+                return true;
+            }

-			List<GeneralRegion> regions = new ArrayList<>();
-			for(GeneralRegion region : plugin.getFileManager().getRegions()) {
-				if(region.isOwner(player)) {
-					regions.add(region);
-				}
-			}
+            List<GeneralRegion> regions = new ArrayList<>();
+            for (GeneralRegion region : plugin.getFileManager().getRegions()) {
+                if (region.isOwner(player)) {
+                    regions.add(region);
+                }
+            }
+            final String name = player.getName();
+            Utils.runAsBatches(regions,
+                    plugin.getConfig().getInt("nameupdate.regionsPerTick"),
+                    (region) -> {
+                        if (region instanceof BuyRegion || region instanceof RentRegion) {
+                            String key = region instanceof BuyRegion ? "buy.buyerName" : "rent.renterName";
+                            if (!name.equals(region.getStringSetting("buy.buyerName"))) {
+                                region.setSetting(key, player.getName());
+                                region.update();
+                            }
+                        }
+                    }, false);
+            return false;
+        }, 22, 10, false);
+    }

-			Do.forAll(
-				plugin.getConfig().getInt("nameupdate.regionsPerTick"),
-				regions,
-				region -> {
-					if(region instanceof BuyRegion) {
-						if(!player.getName().equals(region.getStringSetting("buy.buyerName"))) {
-							region.setSetting("buy.buyerName", player.getName());
-							region.update();
-						}
-					} else if(region instanceof RentRegion) {
-						if(!player.getName().equals(region.getStringSetting("rent.renterName"))) {
-							region.setSetting("rent.renterName", player.getName());
-							region.update();
-						}
-					}
-				}
-			);
-			return false;
-		});
-	}
+    // Active time updates
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerLogout(PlayerQuitEvent event) {
+        updateLastActive(event.getPlayer());
+    }

-	// Active time updates
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerLogout(PlayerQuitEvent event) {
-		updateLastActive(event.getPlayer());
-	}
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerKick(PlayerKickEvent event) {
+        updateLastActive(event.getPlayer());
+    }

-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerKick(PlayerKickEvent event) {
-		updateLastActive(event.getPlayer());
-	}
-
-	/**
-	 * Update the last active time for all regions the player is owner off.
-	 * @param player The player to update the active times for
-	 */
-	private void updateLastActive(Player player) {
-		for(GeneralRegion region : plugin.getFileManager().getRegions()) {
-			if(region.isOwner(player)) {
-				region.updateLastActiveTime();
-			}
-		}
-	}
+    /**
+     * Update the last active time for all regions the player is owner off.
+     *
+     * @param player The player to update the active times for
+     */
+    private void updateLastActive(Player player) {
+        for (GeneralRegion region : plugin.getFileManager().getRegions()) {
+            if (region.isOwner(player)) {
+                region.updateLastActiveTime();
+            }
+        }
+    }
 }


@@ -34,17 +34,11 @@ import me.wiefferink.areashop.commands.StackCommand;
 import me.wiefferink.areashop.commands.StopresellCommand;
 import me.wiefferink.areashop.commands.TeleportCommand;
 import me.wiefferink.areashop.commands.UnrentCommand;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
+import org.bukkit.command.*;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.*;

-public class CommandManager extends Manager implements CommandExecutor, TabCompleter {
+public class CommandManager extends Manager implements TabExecutor {
 	private final ArrayList<CommandAreaShop> commands;

 	/**
@@ -88,14 +82,13 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl

 		// Register commands in bukkit
 		plugin.getCommand("AreaShop").setExecutor(this);
-		plugin.getCommand("AreaShop").setTabCompleter(this);
 	}

 	/**
 	 * Get the list with AreaShop commands.
 	 * @return The list with AreaShop commands
 	 */
-	public ArrayList<CommandAreaShop> getCommands() {
+	public List<CommandAreaShop> getCommands() {
 		return commands;
 	}

@@ -114,7 +107,7 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 		plugin.message(target, "help-alias");
 		for(CommandAreaShop command : commands) {
 			String help = command.getHelp(target);
-			if(help != null && help.length() != 0) {
+			if(help != null && !help.isEmpty()) {
 				messages.add(help);
 			}
 		}
@@ -130,11 +123,13 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 			plugin.message(sender, "general-notReady");
 			return true;
 		}
+
 		// Redirect `/as info player <player>` to `/as me <player>`
 		if(args.length == 3 && "info".equals(args[0]) && "player".equals(args[1])) {
 			args[0] = "me";
 			args[1] = args[2];
 		}
+
 		// Execute command
 		boolean executed = false;
 		for(int i = 0; i < commands.size() && !executed; i++) {
@@ -143,25 +138,30 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 				executed = true;
 			}
 		}
-		if(!executed && args.length == 0) {
-			this.showHelp(sender);
-		} else if(!executed && args.length > 0) {
-			// Indicate that the '/as updaterents' and '/as updatebuys' commands are removed
-			if("updaterents".equalsIgnoreCase(args[0]) || "updatebuys".equalsIgnoreCase(args[0])) {
-				plugin.message(sender, "reload-updateCommandChanged");
+
+		// Show help
+		if (!executed) {
+			if (args.length == 0) {
+				this.showHelp(sender);
 			} else {
-				plugin.message(sender, "cmd-notValid");
+				// Indicate that the '/as updaterents' and '/as updatebuys' commands are removed
+				if("updaterents".equalsIgnoreCase(args[0]) || "updatebuys".equalsIgnoreCase(args[0])) {
+					plugin.message(sender, "reload-updateCommandChanged");
+				} else {
+					plugin.message(sender, "cmd-notValid");
+				}
 			}
 		}
+
 		return true;
 	}

 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-		List<String> result = new ArrayList<>();
 		if(!sender.hasPermission("areashop.tabcomplete")) {
-			return result;
+			return Collections.emptyList();
 		}
+		List<String> result = new ArrayList<>();
 		int toCompleteNumber = args.length;
 		String toCompletePrefix = args[args.length - 1].toLowerCase();
 		//AreaShop.debug("toCompleteNumber=" + toCompleteNumber + ", toCompletePrefix=" + toCompletePrefix + ", length=" + toCompletePrefix.length());
@@ -181,7 +181,7 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 			}
 		}
 		// Filter and sort the results
-		if(result.size() > 0) {
+		if(!result.isEmpty()) {
 			SortedSet<String> set = new TreeSet<>();
 			for(String suggestion : result) {
 				if(suggestion.toLowerCase().startsWith(toCompletePrefix)) {
@@ -1,6 +1,7 @@
 package me.wiefferink.areashop.managers;

 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.features.CommandsFeature;
 import me.wiefferink.areashop.features.DebugFeature;
 import me.wiefferink.areashop.features.FriendsFeature;
 import me.wiefferink.areashop.features.RegionFeature;
@@ -25,7 +26,8 @@ public class FeatureManager extends Manager {
 			SignsFeature.class,
 			FriendsFeature.class,
 			WorldGuardRegionFlagsFeature.class,
-			TeleportFeature.class
+			TeleportFeature.class,
+			CommandsFeature.class
 	));
 	// One instance of each feature, registered for event handling
 	private final Set<RegionFeature> globalFeatures;
@@ -40,13 +42,11 @@ public class FeatureManager extends Manager {
 		for(Class<? extends RegionFeature> clazz : featureClasses) {
 			try {
 				Constructor<? extends RegionFeature> constructor = clazz.getConstructor();
-				try {
-					RegionFeature feature = constructor.newInstance();
-					feature.listen();
-					globalFeatures.add(feature);
-				} catch(InstantiationException | IllegalAccessException | InvocationTargetException | IllegalArgumentException e) {
-					AreaShop.error("Failed to instantiate global feature:", clazz, e);
-				}
+				RegionFeature feature = constructor.newInstance();
+				feature.listen();
+				globalFeatures.add(feature);
+			} catch(InstantiationException | IllegalAccessException | InvocationTargetException | IllegalArgumentException e) {
+				AreaShop.error("Failed to instantiate global feature:", clazz, e);
 			} catch(NoSuchMethodException e) {
 				// Feature does not have a global part
 			}
@@ -68,6 +68,8 @@ public class FeatureManager extends Manager {
 		for(RegionFeature feature : globalFeatures) {
 			feature.shutdown();
 		}
+		// FIXME make this system less hacky!
+		SignsFeature.shutdownGlobalState();
 	}

 	/**
@@ -80,7 +82,7 @@ public class FeatureManager extends Manager {
 		try {
 			return regionFeatureConstructors.get(featureClazz).newInstance(region);
 		} catch(InstantiationException | InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
-			AreaShop.error("Failed to instanciate feature", featureClazz, "for region", region, e, e.getCause());
+			AreaShop.error("Failed to instantiate feature", featureClazz, "for region", region, e, e.getCause());
 		}
 		return null;
 	}
@@ -0,0 +1,79 @@
+package me.wiefferink.areashop.managers;
+
+import me.wiefferink.areashop.AreaShop;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.sql.Date;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.StringJoiner;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class SignErrorLogger {
+
+    public static final String PREFIX_WARN = "[Warning] [Sign Feature] ";
+    public static final DateFormat FORMAT = new SimpleDateFormat("MM/dd/yy HH:mm:ss");
+
+    private final List<String> cache = new LinkedList<>();
+    private final AtomicBoolean needsSaving = new AtomicBoolean(false);
+
+    private final File file;
+
+    public SignErrorLogger(File file) {
+        this.file = Objects.requireNonNull(file);
+    }
+
+    public void clearCache() {
+        synchronized (this.cache) {
+            this.cache.clear();
+        }
+    }
+
+    public SignErrorLogger submitWarning(String message) {
+        final String actual = FORMAT.format(Date.from(Instant.now())) + PREFIX_WARN + message;
+        synchronized (this.cache) {
+            this.cache.add(actual);
+        }
+        return this;
+    }
+
+    public void queueSave() {
+        this.needsSaving.set(true);
+    }
+
+    public void saveIfDirty() {
+        if (this.needsSaving.get()) {
+            save();
+        }
+    }
+
+    public synchronized void save() {
+        AreaShop.debugTask("[Sign Feature] Dumping sign errors to disk...");
+        final String[] copy;
+        synchronized (this.cache) {
+            copy = cache.toArray(new String[0]);
+        }
+        final StringJoiner joiner = new StringJoiner(System.lineSeparator());
+        for (String s : copy) {
+            joiner.add(s);
+        }
+        try (OutputStream os = new FileOutputStream(file);
+             OutputStreamWriter writer = new OutputStreamWriter(os, StandardCharsets.UTF_8)) {
+            writer.write(joiner.toString());
+        } catch (IOException ex) {
+            ex.printStackTrace();
+            AreaShop.error("Failed to update the sign error log!");
+        } finally {
+            AreaShop.debugTask("[Sign Feature] Error dump complete.");
+        }
+    }
+}
@@ -10,6 +10,9 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Sign;
+import org.bukkit.block.data.type.WallSign;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -18,7 +21,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.material.Sign;
 import org.bukkit.util.BlockIterator;

 import java.util.HashMap;
@@ -131,8 +133,16 @@ public class SignLinkerManager extends Manager implements Listener {
 					plugin.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
 					return;
 				}
-				Sign sign = (Sign)block.getState().getData();
-				linker.setSign(block.getLocation(), block.getType(), sign.getFacing());
+				final BlockData blockData = block.getBlockData();
+				final BlockFace rotation;
+				if (blockData instanceof Sign) {
+					rotation = ((Sign) blockData).getRotation();
+				} else if (blockData instanceof WallSign) {
+					rotation = ((WallSign) blockData).getFacing();
+				} else {
+					rotation = null;
+				}
+				linker.setSign(block.getLocation(), block.getType(), rotation);
 			}
 		}
 	}
@@ -259,189 +259,187 @@ public class BuyRegion extends GeneralRegion {
 	@SuppressWarnings("deprecation")
 	public boolean buy(OfflinePlayer offlinePlayer) {
 		// Check if the player has permission
-		if(plugin.hasPermission(offlinePlayer, "areashop.buy")) {
-			if(plugin.getEconomy() == null) {
-				message(offlinePlayer, "general-noEconomy");
+		if(!plugin.hasPermission(offlinePlayer, "areashop.buy")) {
+			message(offlinePlayer, "buy-noPermission");
+			return false;
+		}
+
+		if(plugin.getEconomy() == null) {
+			message(offlinePlayer, "general-noEconomy");
+			return false;
+		}
+
+		if(isInResellingMode()) {
+			if(!plugin.hasPermission(offlinePlayer, "areashop.buyresell")) {
+				message(offlinePlayer, "buy-noPermissionResell");
 				return false;
 			}
-			if(isInResellingMode()) {
-				if(!plugin.hasPermission(offlinePlayer, "areashop.buyresell")) {
-					message(offlinePlayer, "buy-noPermissionResell");
-					return false;
-				}
-			} else {
-				if(!plugin.hasPermission(offlinePlayer, "areashop.buynormal")) {
-					message(offlinePlayer, "buy-noPermissionNoResell");
-					return false;
-				}
-			}
-			if(getWorld() == null) {
-				message(offlinePlayer, "general-noWorld");
-				return false;
-			}
-			if(getRegion() == null) {
-				message(offlinePlayer, "general-noRegion");
-				return false;
-			}
-			if(!isSold() || (isInResellingMode() && !isBuyer(offlinePlayer))) {
-				boolean isResell = isInResellingMode();
-
-				// Only relevant if the player is online
-				Player player = offlinePlayer.getPlayer();
-				if(player != null) {
-					// Check if the players needs to be in the region for buying
-					if(restrictedToRegion() && (!player.getWorld().getName().equals(getWorldName())
-							|| !getRegion().contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
-						message(offlinePlayer, "buy-restrictedToRegion");
-						return false;
-					}
-					// Check if the players needs to be in the world for buying
-					if(restrictedToWorld() && !player.getWorld().getName().equals(getWorldName())) {
-						message(offlinePlayer, "buy-restrictedToWorld", player.getWorld().getName());
-						return false;
-					}
-				}
-
-				// Check region limits
-				LimitResult limitResult = this.limitsAllow(RegionType.BUY, offlinePlayer);
-				AreaShop.debug("LimitResult: " + limitResult.toString());
-				if(!limitResult.actionAllowed()) {
-					if(limitResult.getLimitingFactor() == LimitType.TOTAL) {
-						message(offlinePlayer, "total-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
-						return false;
-					}
-					if(limitResult.getLimitingFactor() == LimitType.BUYS) {
-						message(offlinePlayer, "buy-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
-						return false;
-					}
-					// Should not be reached, but is safe like this
-					return false;
-				}
-
-				// Check if the player has enough money
-				if((!isResell && plugin.getEconomy().has(offlinePlayer, getWorldName(), getPrice())) || (isResell && plugin.getEconomy().has(offlinePlayer, getWorldName(), getResellPrice()))) {
-					UUID oldOwner = getBuyer();
-					if(isResell && oldOwner != null) {
-						// Broadcast and check event
-						ResellingRegionEvent event = new ResellingRegionEvent(this, offlinePlayer);
-						Bukkit.getPluginManager().callEvent(event);
-						if(event.isCancelled()) {
-							message(offlinePlayer, "general-cancelled", event.getReason());
-							return false;
-						}
-
-						getFriendsFeature().clearFriends();
-						double resellPrice = getResellPrice();
-						// Transfer the money to the previous owner
-						EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getResellPrice());
-						if(!r.transactionSuccess()) {
-							message(offlinePlayer, "buy-payError");
-							AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while buying " + getName() + ": " + r.errorMessage);
-							return false;
-						}
-						r = null;
-						OfflinePlayer oldOwnerPlayer = Bukkit.getOfflinePlayer(oldOwner);
-						String oldOwnerName = getPlayerName();
-						if(oldOwnerPlayer != null && oldOwnerPlayer.getName() != null) {
-							r = plugin.getEconomy().depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
-							oldOwnerName = oldOwnerPlayer.getName();
-						} else if(oldOwnerName != null) {
-							r = plugin.getEconomy().depositPlayer(oldOwnerName, getWorldName(), getResellPrice());
-						}
-						if(r == null || !r.transactionSuccess()) {
-							AreaShop.warn("Something went wrong with paying '" + oldOwnerName + "' " + getFormattedPrice() + " for his resell of region " + getName() + " to " + offlinePlayer.getName());
-						}
-						// Resell is done, disable that now
-						disableReselling();
-						// Run commands
-						this.runEventCommands(RegionEvent.RESELL, true);
-						// Set the owner
-						setBuyer(offlinePlayer.getUniqueId());
-						updateLastActiveTime();
-
-						// Update everything
-						handleSchematicEvent(RegionEvent.RESELL);
-
-						// Notify about updates
-						this.notifyAndUpdate(new ResoldRegionEvent(this, oldOwner));
-
-						// Send message to the player
-						message(offlinePlayer, "buy-successResale", oldOwnerName);
-						Player seller = Bukkit.getPlayer(oldOwner);
-						if(seller != null) {
-							message(seller, "buy-successSeller", resellPrice);
-						}
-						// Run commands
-						this.runEventCommands(RegionEvent.RESELL, false);
-					} else {
-						// Broadcast and check event
-						BuyingRegionEvent event = new BuyingRegionEvent(this, offlinePlayer);
-						Bukkit.getPluginManager().callEvent(event);
-						if(event.isCancelled()) {
-							message(offlinePlayer, "general-cancelled", event.getReason());
-							return false;
-						}
-
-						// Substract the money from the players balance
-						EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getPrice());
-						if(!r.transactionSuccess()) {
-							message(offlinePlayer, "buy-payError");
-							return false;
-						}
-						// Optionally give money to the landlord
-						OfflinePlayer landlordPlayer = null;
-						if(getLandlord() != null) {
-							landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
-						}
-						String landlordName = getLandlordName();
-						if(landlordName != null) {
-							if(landlordPlayer != null && landlordPlayer.getName() != null) {
-								r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), getPrice());
-							} else {
-								r = plugin.getEconomy().depositPlayer(landlordName, getWorldName(), getPrice());
-							}
-							if(r != null && !r.transactionSuccess()) {
-								AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + getFormattedPrice() + " for his sell of region " + getName() + " to " + offlinePlayer.getName());
-							}
-						}
-
-						// Run commands
-						this.runEventCommands(RegionEvent.BOUGHT, true);
-						// Set the owner
-						setBuyer(offlinePlayer.getUniqueId());
-						updateLastActiveTime();
-
-						// Notify about updates
-						this.notifyAndUpdate(new BoughtRegionEvent(this));
-
-						// Update everything
-						handleSchematicEvent(RegionEvent.BOUGHT);
-
-						// Send message to the player
-						message(offlinePlayer, "buy-succes");
-						// Run commands
-						this.runEventCommands(RegionEvent.BOUGHT, false);
-					}
-					return true;
-				} else {
-					// Player has not enough money
-					if(isResell) {
-						message(offlinePlayer, "buy-lowMoneyResell", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
-					} else {
-						message(offlinePlayer, "buy-lowMoney", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
-					}
-				}
-			} else {
-				if(isBuyer(offlinePlayer)) {
-					message(offlinePlayer, "buy-yours");
-				} else {
-					message(offlinePlayer, "buy-someoneElse");
-				}
-			}
 		} else {
-			message(offlinePlayer, "buy-noPermission");
+			if(!plugin.hasPermission(offlinePlayer, "areashop.buynormal")) {
+				message(offlinePlayer, "buy-noPermissionNoResell");
+				return false;
+			}
 		}
-		return false;
+
+		if(getWorld() == null) {
+			message(offlinePlayer, "general-noWorld");
+			return false;
+		}
+
+		if(getRegion() == null) {
+			message(offlinePlayer, "general-noRegion");
+			return false;
+		}
+
+		if (isSold() && !(isInResellingMode() && !isBuyer(offlinePlayer))) {
+			if(isBuyer(offlinePlayer)) {
+				message(offlinePlayer, "buy-yours");
+			} else {
+				message(offlinePlayer, "buy-someoneElse");
+			}
+			return false;
+		}
+
+		boolean isResell = isInResellingMode();
+
+		// Only relevant if the player is online
+		Player player = offlinePlayer.getPlayer();
+		if(player != null) {
+			// Check if the players needs to be in the region for buying
+			if(restrictedToRegion() && (!player.getWorld().getName().equals(getWorldName())
+					|| !getRegion().contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
+				message(offlinePlayer, "buy-restrictedToRegion");
+				return false;
+			}
+			// Check if the players needs to be in the world for buying
+			if(restrictedToWorld() && !player.getWorld().getName().equals(getWorldName())) {
+				message(offlinePlayer, "buy-restrictedToWorld", player.getWorld().getName());
+				return false;
+			}
+		}
+
+		// Check region limits
+		LimitResult limitResult = this.limitsAllow(RegionType.BUY, offlinePlayer);
+		AreaShop.debug("LimitResult: " + limitResult.toString());
+		if(!limitResult.actionAllowed()) {
+			if(limitResult.getLimitingFactor() == LimitType.TOTAL) {
+				message(offlinePlayer, "total-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
+				return false;
+			}
+			if(limitResult.getLimitingFactor() == LimitType.BUYS) {
+				message(offlinePlayer, "buy-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
+				return false;
+			}
+			// Should not be reached, but is safe like this
+			return false;
+		}
+
+		// Check if the player has enough money
+		if (isResell && !plugin.getEconomy().has(offlinePlayer, getWorldName(), getResellPrice())) {
+			message(offlinePlayer, "buy-lowMoneyResell", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+			return false;
+		}
+		if (!isResell && !plugin.getEconomy().has(offlinePlayer, getWorldName(), getPrice())) {
+			message(offlinePlayer, "buy-lowMoney", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+			return false;
+		}
+
+		UUID oldOwner = getBuyer();
+		if(isResell && oldOwner != null) {
+			// Broadcast and check event
+			ResellingRegionEvent event = new ResellingRegionEvent(this, offlinePlayer);
+			Bukkit.getPluginManager().callEvent(event);
+			if(event.isCancelled()) {
+				message(offlinePlayer, "general-cancelled", event.getReason());
+				return false;
+			}
+
+			getFriendsFeature().clearFriends();
+			double resellPrice = getResellPrice();
+			// Transfer the money to the previous owner
+			EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getResellPrice());
+			if(!r.transactionSuccess()) {
+				message(offlinePlayer, "buy-payError");
+				AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while buying " + getName() + ": " + r.errorMessage);
+				return false;
+			}
+			r = null;
+			OfflinePlayer oldOwnerPlayer = Bukkit.getOfflinePlayer(oldOwner);
+			String oldOwnerName = getPlayerName();
+			if(oldOwnerPlayer.hasPlayedBefore() && oldOwnerPlayer.getName() != null) {
+				r = plugin.getEconomy().depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
+				oldOwnerName = oldOwnerPlayer.getName();
+			} else if(oldOwnerName != null) {
+				r = plugin.getEconomy().depositPlayer(oldOwnerName, getWorldName(), getResellPrice());
+			}
+			if(r == null || !r.transactionSuccess()) {
+				AreaShop.warn("Something went wrong with paying '" + oldOwnerName + "' " + getFormattedPrice() + " for his resell of region " + getName() + " to " + offlinePlayer.getName());
+			}
+			// Resell is done, disable that now
+			disableReselling();
+
+			// Set the owner
+			setBuyer(offlinePlayer.getUniqueId());
+			updateLastActiveTime();
+
+			// Update everything
+			handleSchematicEvent(RegionEvent.RESELL);
+
+			// Notify about updates
+			this.notifyAndUpdate(new ResoldRegionEvent(this, oldOwner));
+
+			// Send message to the player
+			message(offlinePlayer, "buy-successResale", oldOwnerName);
+			Player seller = Bukkit.getPlayer(oldOwner);
+			if(seller != null) {
+				message(seller, "buy-successSeller", resellPrice);
+			}
+		} else {
+			// Broadcast and check event
+			BuyingRegionEvent event = new BuyingRegionEvent(this, offlinePlayer);
+			Bukkit.getPluginManager().callEvent(event);
+			if(event.isCancelled()) {
+				message(offlinePlayer, "general-cancelled", event.getReason());
+				return false;
+			}
+
+			// Substract the money from the players balance
+			EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getPrice());
+			if(!r.transactionSuccess()) {
+				message(offlinePlayer, "buy-payError");
+				return false;
+			}
+			// Optionally give money to the landlord
+			OfflinePlayer landlordPlayer = null;
+			if(getLandlord() != null) {
+				landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
+			}
+			String landlordName = getLandlordName();
+			if(landlordName != null) {
+				if(landlordPlayer != null && landlordPlayer.getName() != null) {
+					r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), getPrice());
+				} else {
+					r = plugin.getEconomy().depositPlayer(landlordName, getWorldName(), getPrice());
+				}
+				if(r != null && !r.transactionSuccess()) {
+					AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + getFormattedPrice() + " for his sell of region " + getName() + " to " + offlinePlayer.getName());
+				}
+			}
+
+			// Set the owner
+			setBuyer(offlinePlayer.getUniqueId());
+			updateLastActiveTime();
+
+			// Send message to the player
+			message(offlinePlayer, "buy-succes");
+
+			// Update everything
+			handleSchematicEvent(RegionEvent.BOUGHT);
+
+			// Notify about updates
+			this.notifyAndUpdate(new BoughtRegionEvent(this));
+		}
+		return true;
 	}

 	/**
@@ -483,9 +481,6 @@ public class BuyRegion extends GeneralRegion {
 			return false;
 		}

-		// Run commands
-		this.runEventCommands(RegionEvent.SOLD, true);
-
 		disableReselling();
 		// Give part of the buying price back
 		double moneyBack = getMoneyBackAmount();
@@ -528,11 +523,12 @@ public class BuyRegion extends GeneralRegion {
 			}
 		}

-		message(executor, "sell-sold");
-
 		// Handle schematic save/restore (while %uuid% is still available)
 		handleSchematicEvent(RegionEvent.SOLD);

+		// Send message: before actual removal of the buyer so that it is still available for variables
+		message(executor, "sell-sold");
+
 		// Remove friends and the owner
 		getFriendsFeature().clearFriends();
 		UUID oldBuyer = getBuyer();
@@ -541,9 +537,6 @@ public class BuyRegion extends GeneralRegion {

 		// Notify about updates
 		this.notifyAndUpdate(new SoldRegionEvent(this, oldBuyer, Math.max(moneyBack, 0)));
-
-		// Run commands
-		this.runEventCommands(RegionEvent.SOLD, false);
 		return true;
 	}

@@ -148,8 +148,8 @@ public class RegionGroup {
 	 */
 	public Set<GeneralRegion> getMemberRegions() {
 		Set<GeneralRegion> result = new HashSet<>();
-		for(String name : getMembers()) {
-			result.add(plugin.getFileManager().getRegion(name));
+		for(String playerName : getMembers()) {
+			result.add(plugin.getFileManager().getRegion(playerName));
 		}
 		return result;
 	}
@@ -316,7 +316,7 @@ public class RentRegion extends GeneralRegion {
 	 */
 	public double getMoneyBackAmount() {
 		Long currentTime = Calendar.getInstance().getTimeInMillis();
-		Double timeLeft = (double)((getRentedUntil() - currentTime));
+		Double timeLeft = (double)(getRentedUntil() - currentTime);
 		double percentage = (getMoneyBackPercentage()) / 100.0;
 		Double timePeriod = (double)(getDuration());
 		double periods = timeLeft / timePeriod;
@@ -347,10 +347,8 @@ public class RentRegion extends GeneralRegion {
 		long now = Calendar.getInstance().getTimeInMillis();
 		if(!isDeleted() && isRented() && now > getRentedUntil()) {
 			// Extend rent if configured for that
-			if(getBooleanSetting("rent.autoExtend")) {
-				if(extend()) {
-					return false;
-				}
+			if(getBooleanSetting("rent.autoExtend") && extend()) {
+				return false;
 			}

 			// Send message to the player if online
@@ -434,200 +432,190 @@ public class RentRegion extends GeneralRegion {
 			message(offlinePlayer, "general-noEconomy");
 			return false;
 		}
-		//Check if the player has permission
-		if(plugin.hasPermission(offlinePlayer, "areashop.rent")) {
-			if(getWorld() == null) {
-				message(offlinePlayer, "general-noWorld");
+
+		// Check if the player has permission
+		if(!plugin.hasPermission(offlinePlayer, "areashop.rent")) {
+			message(offlinePlayer, "rent-noPermission");
+			return false;
+		}
+
+		// Check location restrictions
+		if(getWorld() == null) {
+			message(offlinePlayer, "general-noWorld");
+			return false;
+		}
+		if(getRegion() == null) {
+			message(offlinePlayer, "general-noRegion");
+			return false;
+		}
+		boolean extend = false;
+		if(getRenter() != null && offlinePlayer.getUniqueId().equals(getRenter())) {
+			extend = true;
+		}
+
+		// Check if available or extending
+		if (isRented() && !extend) {
+			message(offlinePlayer, "rent-someoneElse");
+			return false;
+		}
+
+		// These checks are only relevant for online players doing the renting/buying themselves
+		Player player = offlinePlayer.getPlayer();
+		if(player != null) {
+			// Check if the players needs to be in the region for renting
+			if(restrictedToRegion() && (!player.getWorld().getName().equals(getWorldName())
+					|| !getRegion().contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
+				message(offlinePlayer, "rent-restrictedToRegion");
 				return false;
 			}
-			if(getRegion() == null) {
-				message(offlinePlayer, "general-noRegion");
+
+			// Check if the players needs to be in the world for renting
+			if(restrictedToWorld() && !player.getWorld().getName().equals(getWorldName())) {
+				message(offlinePlayer, "rent-restrictedToWorld", player.getWorld().getName());
 				return false;
 			}
-			boolean extend = false;
-			if(getRenter() != null && offlinePlayer.getUniqueId().equals(getRenter())) {
-				extend = true;
+		}
+
+		// Check region limits if this is not extending
+		if(!(extend && config.getBoolean("allowRegionExtendsWhenAboveLimits"))) {
+
+			LimitResult limitResult;
+			if(extend) {
+				limitResult = this.limitsAllow(RegionType.RENT, offlinePlayer, true);
+			} else {
+				limitResult = this.limitsAllow(RegionType.RENT, offlinePlayer);
 			}
-			// Check if the region is available for renting or if the player wants to extend the rent
-			if(!isRented() || extend) {
-				// These checks are only relevant for online players doing the renting/buying themselves
-				Player player = offlinePlayer.getPlayer();
-				if(player != null) {
-					// Check if the players needs to be in the region for renting
-					if(restrictedToRegion() && (!player.getWorld().getName().equals(getWorldName())
-							|| !getRegion().contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
-						message(offlinePlayer, "rent-restrictedToRegion");
-						return false;
-					}
-
-					// Check if the players needs to be in the world for renting
-					if(restrictedToWorld() && !player.getWorld().getName().equals(getWorldName())) {
-						message(offlinePlayer, "rent-restrictedToWorld", player.getWorld().getName());
-						return false;
-					}
+			AreaShop.debug("LimitResult: " + limitResult.toString());
+			if(!limitResult.actionAllowed()) {
+				if(limitResult.getLimitingFactor() == LimitType.TOTAL) {
+					message(offlinePlayer, "total-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
+					return false;
 				}
-
-				// Check region limits if this is not extending
-				if(!(extend && config.getBoolean("allowRegionExtendsWhenAboveLimits"))) {
-
-					LimitResult limitResult;
-					if(extend) {
-						limitResult = this.limitsAllow(RegionType.RENT, offlinePlayer, true);
-					} else {
-						limitResult = this.limitsAllow(RegionType.RENT, offlinePlayer);
-					}
-					AreaShop.debug("LimitResult: " + limitResult.toString());
-					if(!limitResult.actionAllowed()) {
-						if(limitResult.getLimitingFactor() == LimitType.TOTAL) {
-							message(offlinePlayer, "total-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
-							return false;
-						}
-						if(limitResult.getLimitingFactor() == LimitType.RENTS) {
-							message(offlinePlayer, "rent-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
-							return false;
-						}
-						if(limitResult.getLimitingFactor() == LimitType.EXTEND) {
-							message(offlinePlayer, "rent-maximumExtend", limitResult.getMaximum(), limitResult.getCurrent() + 1, limitResult.getLimitingGroup());
-							return false;
-						}
-						return false;
-					}
+				if(limitResult.getLimitingFactor() == LimitType.RENTS) {
+					message(offlinePlayer, "rent-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
+					return false;
 				}
-
-				// Check if the player can still extend this rent
-				if(extend && !plugin.hasPermission(offlinePlayer, "areashop.rentextendbypass")) {
-					if(getMaxExtends() >= 0 && getTimesExtended() >= getMaxExtends()) {
-						message(offlinePlayer, "rent-maxExtends");
-						return false;
-					}
+				if(limitResult.getLimitingFactor() == LimitType.EXTEND) {
+					message(offlinePlayer, "rent-maximumExtend", limitResult.getMaximum(), limitResult.getCurrent() + 1, limitResult.getLimitingGroup());
+					return false;
 				}
+				return false;
+			}
+		}

-				// Check if there is enough time left before hitting maxRentTime
-				boolean extendToMax = false;
-				double price = getPrice();
-				long timeNow = Calendar.getInstance().getTimeInMillis();
-				long timeRented = 0;
-				long maxRentTime = getMaxRentTime();
-				if(isRented()) {
-					timeRented = getRentedUntil() - timeNow;
-				}
-				if((timeRented + getDuration()) > (maxRentTime)
-						&& !plugin.hasPermission(offlinePlayer, "areashop.renttimebypass")
-						&& maxRentTime != -1) {
-					// Extend to the maximum instead of adding a full period
-					if(getBooleanSetting("rent.extendToFullWhenAboveMaxRentTime")) {
-						if(timeRented >= maxRentTime) {
-							message(offlinePlayer, "rent-alreadyAtFull");
-							return false;
-						} else {
-							long toRentPart = maxRentTime - timeRented;
-							extendToMax = true;
-							price = ((double)toRentPart) / getDuration() * price;
-						}
-					} else {
-						message(offlinePlayer, "rent-maxRentTime");
-						return false;
-					}
-				}
+		// Check if the player can still extend this rent
+		if(extend && !plugin.hasPermission(offlinePlayer, "areashop.rentextendbypass")) {
+			if(getMaxExtends() >= 0 && getTimesExtended() >= getMaxExtends()) {
+				message(offlinePlayer, "rent-maxExtends");
+				return false;
+			}
+		}

-				if(plugin.getEconomy().has(offlinePlayer, getWorldName(), price)) {
-					// Broadcast and check event
-					RentingRegionEvent event = new RentingRegionEvent(this, offlinePlayer, extend);
-					Bukkit.getPluginManager().callEvent(event);
-					if(event.isCancelled()) {
-						message(offlinePlayer, "general-cancelled", event.getReason());
-						return false;
-					}
-
-					// Substract the money from the players balance
-					EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), price);
-					if(!r.transactionSuccess()) {
-						message(offlinePlayer, "rent-payError");
-						AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while renting " + getName() + ": " + r.errorMessage);
-						return false;
-					}
-					// Optionally give money to the landlord
-					OfflinePlayer landlordPlayer = null;
-					if(getLandlord() != null) {
-						landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
-					}
-					String landlordName = getLandlordName();
-					if(landlordName != null) {
-						if(landlordPlayer != null && landlordPlayer.getName() != null) {
-							r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), price);
-						} else {
-							r = plugin.getEconomy().depositPlayer(landlordName, getWorldName(), price);
-						}
-						if(r == null || !r.transactionSuccess()) {
-							AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + Utils.formatCurrency(price) + " for his rent of region " + getName() + " to " + offlinePlayer.getName());
-						}
-					}
-
-					if(!extend) {
-						// Run commands
-						runEventCommands(RegionEvent.RENTED, true);
-					} else {
-						// Run commands
-						runEventCommands(RegionEvent.EXTENDED, true);
-					}
-
-					// Get the time until the region will be rented
-					Calendar calendar = Calendar.getInstance();
-					if(extendToMax) {
-						calendar.setTimeInMillis(calendar.getTimeInMillis() + getMaxRentTime());
-					} else if(extend) {
-						calendar.setTimeInMillis(getRentedUntil() + getDuration());
-					} else {
-						calendar.setTimeInMillis(calendar.getTimeInMillis() + getDuration());
-					}
-
-					// Add values to the rent and send it to FileManager
-					setRentedUntil(calendar.getTimeInMillis());
-					setRenter(offlinePlayer.getUniqueId());
-					updateLastActiveTime();
-
-					// Fire schematic event and updated times extended
-					if(!extend) {
-						this.handleSchematicEvent(RegionEvent.RENTED);
-						setTimesExtended(0);
-					} else {
-						setTimesExtended(getTimesExtended() + 1);
-					}
-
-					// Notify about updates
-					this.notifyAndUpdate(new RentedRegionEvent(this, extend));
-
-					// Send message to the player
-					if(extendToMax) {
-						message(offlinePlayer, "rent-extendedToMax");
-					} else if(extend) {
-						message(offlinePlayer, "rent-extended");
-					} else {
-						message(offlinePlayer, "rent-rented");
-					}
-					if(!extend) {
-						// Run commands
-						this.runEventCommands(RegionEvent.RENTED, false);
-					} else {
-						// Run commands
-						this.runEventCommands(RegionEvent.EXTENDED, false);
-					}
-					return true;
+		// Check if there is enough time left before hitting maxRentTime
+		boolean extendToMax = false;
+		double price = getPrice();
+		long timeNow = Calendar.getInstance().getTimeInMillis();
+		long timeRented = 0;
+		long maxRentTime = getMaxRentTime();
+		if(isRented()) {
+			timeRented = getRentedUntil() - timeNow;
+		}
+		if((timeRented + getDuration()) > (maxRentTime)
+				&& !plugin.hasPermission(offlinePlayer, "areashop.renttimebypass")
+				&& maxRentTime != -1) {
+			// Extend to the maximum instead of adding a full period
+			if(getBooleanSetting("rent.extendToFullWhenAboveMaxRentTime")) {
+				if(timeRented >= maxRentTime) {
+					message(offlinePlayer, "rent-alreadyAtFull");
+					return false;
 				} else {
-					// Player has not enough money
-					if(extend) {
-						message(offlinePlayer, "rent-lowMoneyExtend", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
-					} else {
-						message(offlinePlayer, "rent-lowMoneyRent", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
-					}
+					long toRentPart = maxRentTime - timeRented;
+					extendToMax = true;
+					price = ((double)toRentPart) / getDuration() * price;
 				}
 			} else {
-				message(offlinePlayer, "rent-someoneElse");
+				message(offlinePlayer, "rent-maxRentTime");
+				return false;
 			}
-		} else {
-			message(offlinePlayer, "rent-noPermission");
 		}
-		return false;
+
+		// Check if the player has enough money
+		if(!plugin.getEconomy().has(offlinePlayer, getWorldName(), price)) {
+			if(extend) {
+				message(offlinePlayer, "rent-lowMoneyExtend", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+			} else {
+				message(offlinePlayer, "rent-lowMoneyRent", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+			}
+			return false;
+		}
+
+		// Broadcast and check event
+		RentingRegionEvent event = new RentingRegionEvent(this, offlinePlayer, extend);
+		Bukkit.getPluginManager().callEvent(event);
+		if(event.isCancelled()) {
+			message(offlinePlayer, "general-cancelled", event.getReason());
+			return false;
+		}
+
+		// Substract the money from the players balance
+		EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), price);
+		if(!r.transactionSuccess()) {
+			message(offlinePlayer, "rent-payError");
+			AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while renting " + getName() + ": " + r.errorMessage);
+			return false;
+		}
+		// Optionally give money to the landlord
+		OfflinePlayer landlordPlayer = null;
+		if(getLandlord() != null) {
+			landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
+		}
+		String landlordName = getLandlordName();
+		if(landlordName != null) {
+			if(landlordPlayer != null && landlordPlayer.getName() != null) {
+				r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), price);
+			} else {
+				r = plugin.getEconomy().depositPlayer(landlordName, getWorldName(), price);
+			}
+			if(r == null || !r.transactionSuccess()) {
+				AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + Utils.formatCurrency(price) + " for his rent of region " + getName() + " to " + offlinePlayer.getName());
+			}
+		}
+
+		// Get the time until the region will be rented
+		Calendar calendar = Calendar.getInstance();
+		if(extendToMax) {
+			calendar.setTimeInMillis(calendar.getTimeInMillis() + getMaxRentTime());
+		} else if(extend) {
+			calendar.setTimeInMillis(getRentedUntil() + getDuration());
+		} else {
+			calendar.setTimeInMillis(calendar.getTimeInMillis() + getDuration());
+		}
+
+		// Add values to the rent and send it to FileManager
+		setRentedUntil(calendar.getTimeInMillis());
+		setRenter(offlinePlayer.getUniqueId());
+		updateLastActiveTime();
+
+		// Fire schematic event and updated times extended
+		if(!extend) {
+			this.handleSchematicEvent(RegionEvent.RENTED);
+			setTimesExtended(0);
+		} else {
+			setTimesExtended(getTimesExtended() + 1);
+		}
+
+		// Send message to the player
+		if(extendToMax) {
+			message(offlinePlayer, "rent-extendedToMax");
+		} else if(extend) {
+			message(offlinePlayer, "rent-extended");
+		} else {
+			message(offlinePlayer, "rent-rented");
+		}
+
+		// Notify about updates
+		this.notifyAndUpdate(new RentedRegionEvent(this, extend));
+		return true;
 	}

 	/**
@@ -662,8 +650,7 @@ public class RentRegion extends GeneralRegion {
 			return false;
 		}

-		// Run commands
-		this.runEventCommands(RegionEvent.UNRENTED, true);
+		// Do a payback
 		double moneyBack = getMoneyBackAmount();
 		if(moneyBack > 0 && giveMoneyBack) {
 			boolean noPayBack = false;
@@ -704,12 +691,12 @@ public class RentRegion extends GeneralRegion {
 			}
 		}

-		// Send messages
-		message(executor, "unrent-unrented");
-
 		// Handle schematic save/restore (while %uuid% is still available)
 		handleSchematicEvent(RegionEvent.UNRENTED);

+		// Send message: before actual removal of the renter so that it is still available for variables
+		message(executor, "unrent-unrented");
+
 		// Remove friends, the owner and renteduntil values
 		getFriendsFeature().clearFriends();
 		UUID oldRenter = getRenter();
@@ -720,9 +707,6 @@ public class RentRegion extends GeneralRegion {

 		// Notify about updates
 		this.notifyAndUpdate(new UnrentedRegionEvent(this, oldRenter, Math.max(0, moneyBack)));
-
-		// Run commands
-		this.runEventCommands(RegionEvent.UNRENTED, false);
 		return true;
 	}

@@ -1,147 +0,0 @@
-package me.wiefferink.areashop.tools;
-
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import org.bstats.Metrics;
-
-import java.util.HashMap;
-
-public class Analytics {
-
-	/**
-	 * Start analytics tracking.
-	 */
-	public static void start() {
-		// Legacy MCstats statistics (remove at some point)
-		try {
-			new me.wiefferink.areashop.lib.Metrics(AreaShop.getInstance()).start();
-			AreaShop.debug("Started mcstats.org statistics service");
-		} catch(Exception e) {
-			AreaShop.debug("Could not start mcstats.org statistics service");
-		}
-
-		// bStats statistics
-		try {
-			Metrics metrics = new Metrics(AreaShop.getInstance());
-
-			// Number of regions
-			metrics.addCustomChart(new Metrics.SingleLineChart("region_count") {
-				@Override
-				public int getValue() {
-					return AreaShop.getInstance().getFileManager().getRegions().size();
-				}
-			});
-
-			// Number of rental regions
-			metrics.addCustomChart(new Metrics.SingleLineChart("rental_region_count") {
-				@Override
-				public int getValue() {
-					return AreaShop.getInstance().getFileManager().getRents().size();
-				}
-			});
-
-			// Number of buy regions
-			metrics.addCustomChart(new Metrics.SingleLineChart("buy_region_count") {
-				@Override
-				public int getValue() {
-					return AreaShop.getInstance().getFileManager().getBuys().size();
-				}
-			});
-
-			// Language
-			metrics.addCustomChart(new Metrics.SimplePie("language") {
-				@Override
-				public String getValue() {
-					return AreaShop.getInstance().getConfig().getString("language");
-				}
-			});
-
-			// Pie with region states
-			metrics.addCustomChart(new Metrics.AdvancedPie("region_state") {
-				@Override
-				public HashMap<String, Integer> getValues(HashMap<String, Integer> result) {
-					RegionStateStats stats = getStateStats();
-					result.put("For Rent", stats.forrent);
-					result.put("Rented", stats.rented);
-					result.put("For Sale", stats.forsale);
-					result.put("Sold", stats.sold);
-					result.put("Reselling", stats.reselling);
-					return result;
-				}
-			});
-
-			// Time series of each region state
-			metrics.addCustomChart(new Metrics.SingleLineChart("forrent_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().forrent;
-				}
-			});
-			metrics.addCustomChart(new Metrics.SingleLineChart("rented_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().rented;
-				}
-			});
-			metrics.addCustomChart(new Metrics.SingleLineChart("forsale_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().forsale;
-				}
-			});
-			metrics.addCustomChart(new Metrics.SingleLineChart("sold_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().sold;
-				}
-			});
-			metrics.addCustomChart(new Metrics.SingleLineChart("reselling_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().reselling;
-				}
-			});
-
-			// TODO track rent/buy/unrent/sell/resell actions (so that it can be reported per collection interval)
-
-			AreaShop.debug("Started bstats.org statistics service");
-		} catch(Exception e) {
-			AreaShop.debug("Could not start bstats.org statistics service");
-		}
-	}
-
-	private static class RegionStateStats {
-		int forrent = 0;
-		int forsale = 0;
-		int rented = 0;
-		int sold = 0;
-		int reselling = 0;
-	}
-
-	private static RegionStateStats getStateStats() {
-		RegionStateStats result = new RegionStateStats();
-		for(GeneralRegion region : AreaShop.getInstance().getFileManager().getRegions()) {
-			if(region instanceof RentRegion) {
-				RentRegion rent = (RentRegion)region;
-				if(rent.isAvailable()) {
-					result.forrent++;
-				} else {
-					result.rented++;
-				}
-			} else if(region instanceof BuyRegion) {
-				BuyRegion buy = (BuyRegion)region;
-				if(buy.isAvailable()) {
-					result.forsale++;
-				} else if(buy.isInResellingMode()) {
-					result.reselling++;
-				} else {
-					result.sold++;
-				}
-			}
-		}
-		return result;
-	}
-
-}
@@ -1,11 +1,11 @@
 package me.wiefferink.areashop.tools;

+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;

 import java.io.BufferedReader;
 import java.io.IOException;
@@ -18,234 +18,242 @@ import java.util.logging.Logger;

 public class GithubUpdateCheck {

-	public static final String API_HOST = "https://api.github.com/repos";
-	public static final String API_LATEST_RELEASE = "releases/latest";
-	public static final String USER_AGENT = "GithubUpdateCheck by NLThijs48";
-	public static final boolean DEBUG = false;
+    public static final String API_HOST = "https://api.github.com/repos";
+    public static final String API_LATEST_RELEASE = "releases/latest";
+    public static final String USER_AGENT = "GithubUpdateCheck by NLThijs48";
+    public static final boolean DEBUG = false;
+    private static final Gson GSON = new GsonBuilder().create();

-	private final String author;
-	private final String repository;
-	private final Plugin plugin;
-	private final Logger logger;
-	private URL url;
-	private VersionComparator versionComparator;
+    private final String author;
+    private final String repository;
+    private final Plugin plugin;
+    private final Logger logger;
+    private final String currentVersion;
+    private URL url;
+    private VersionComparator versionComparator;
+    // Status
+    private boolean checking;
+    private boolean error;
+    private boolean hasUpdate;
+    private String latestVersion;

-	// Status
-	private boolean checking;
-	private boolean error;
-	private boolean hasUpdate;
-	private String latestVersion;
-	private final String currentVersion;
+    /**
+     * Create a new GithubUpdateCheck with the required information.
+     *
+     * @param plugin     The plugin to create it for (used for logging and checking version)
+     * @param author     The author of the plugin as used on Github
+     * @param repository The repository name of the plugin on Github
+     */
+    public GithubUpdateCheck(Plugin plugin, String author, String repository) {
+        this.plugin = plugin;
+        this.logger = plugin.getLogger();
+        this.author = author;
+        this.repository = repository;
+        this.currentVersion = plugin.getDescription().getVersion();
+        this.versionComparator = (latest, current) ->
+                !latest.equalsIgnoreCase(current);

-	/**
-	 * Create a new GithubUpdateCheck with the required information.
-	 * @param plugin            The plugin to create it for (used for logging and checking version)
-	 * @param author            The author of the plugin as used on Github
-	 * @param repository        The repository name of the plugin on Github
-	 */
-	public GithubUpdateCheck(Plugin plugin, String author, String repository) {
-		this.plugin = plugin;
-		this.logger = plugin.getLogger();
-		this.author = author;
-		this.repository = repository;
-		this.currentVersion = plugin.getDescription().getVersion();
-		this.versionComparator = (latestVersion, currentVersion) ->
-				!latestVersion.equalsIgnoreCase(currentVersion);
+        this.checking = false;
+        this.error = false;
+        this.hasUpdate = false;
+    }

-		this.checking = false;
-		this.error = false;
-		this.hasUpdate = false;
-	}
+    /**
+     * Change the version comparator.
+     *
+     * @param versionComparator VersionComparator to use for checking if one version is newer than the other
+     * @return this
+     */
+    public GithubUpdateCheck withVersionComparator(VersionComparator versionComparator) {
+        this.versionComparator = versionComparator;
+        return this;
+    }

-	/**
-	 * Change the version comparator.
-	 * @param versionComparator VersionComparator to use for checking if one version is newer than the other
-	 * @return this
-	 */
-	public GithubUpdateCheck withVersionComparator(VersionComparator versionComparator) {
-		this.versionComparator = versionComparator;
-		return this;
-	}
+    /**
+     * Check if an update is available.
+     */
+    public void checkUpdate() {
+        checkUpdate(null);
+    }

-	/**
-	 * Check if an update is available.
-	 */
-	public void checkUpdate() {
-		checkUpdate(null);
-	}
+    /**
+     * Check if an update is available.
+     *
+     * @param callback Callback to execute when the update check is done
+     * @return GithubUpdateCheck containing the status of the check
+     */
+    public GithubUpdateCheck checkUpdate(UpdateCallback callback) {
+        checking = true;
+        final GithubUpdateCheck self = this;
+        // Check for update on async thread
+        Utils.newChain()
+             .async(() -> {
+                        try {
+                            try {
+                                String rawUrl = API_HOST + "/" + author + "/" + repository + "/" + API_LATEST_RELEASE;
+                                url = new URL(rawUrl);
+                            } catch (MalformedURLException e) {
+                                logger.severe("Invalid url: '" + url + "', are the author '" + author + "' and repository '" + repository + "' correct?");
+                                error = true;
+                                return;
+                            }

-	/**
-	 * Check if an update is available.
-	 * @param callback Callback to execute when the update check is done
-	 * @return GithubUpdateCheck containing the status of the check
-	 */
-	public GithubUpdateCheck checkUpdate(UpdateCallback callback) {
-		checking = true;
-		final GithubUpdateCheck self = this;
-		// Check for update on asyn thread
-		new BukkitRunnable() {
-			@Override
-			public void run() {
-				try {
-					try {
-						String rawUrl = API_HOST + "/" + author + "/" + repository + "/" + API_LATEST_RELEASE;
-						url = new URL(rawUrl);
-					} catch(MalformedURLException e) {
-						logger.severe("Invalid url: '" + url + "', are the author '" + author + "' and repository '" + repository + "' correct?");
-						error = true;
-						return;
-					}
+                            try {
+                                URLConnection conn = url.openConnection();
+                                // Give up after 15 seconds
+                                conn.setConnectTimeout(15000);
+                                // Identify ourselves
+                                conn.addRequestProperty("User-Agent", USER_AGENT);
+                                // Make sure we access the correct api version
+                                conn.addRequestProperty("Accept", "application/vnd.github.v3+json");
+                                // We want to read the result
+                                conn.setDoOutput(true);
+                                // Open connection
+                                try (BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
+                                    String response = reader.readLine();
+                                    debug("Response:", response);

-					try {
-						URLConnection conn = url.openConnection();
-						// Give up after 15 seconds
-						conn.setConnectTimeout(15000);
-						// Identify ourselves
-						conn.addRequestProperty("User-Agent", USER_AGENT);
-						// Make sure we access the correct api version
-						conn.addRequestProperty("Accept", "application/vnd.github.v3+json");
-						// We want to read the result
-						conn.setDoOutput(true);
-						// Open connection
-						try(BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
-							String response = reader.readLine();
-							debug("Response:", response);
+                                    JsonObject latestRelease = GSON.fromJson(response, JsonObject.class);

-							JSONObject latestRelease = (JSONObject)JSONValue.parse(response);
+                                    if (latestRelease.isJsonNull()) {
+                                        logger.warning("Failed to get api response from " + url);
+                                        error = true;
+                                        return;
+                                    }
+                                    debug("json: " + latestRelease.toString());

-							if(latestRelease.isEmpty()) {
-								logger.warning("Failed to get api response from " + url);
-								error = true;
-								return;
-							}
-							debug("json: " + latestRelease.toJSONString());
+                                    // Latest version
+                                    latestVersion = latestRelease.get("tag_name").getAsString();
+                                    debug("Tag name:", latestVersion);

-							// Latest version
-							latestVersion = (String)latestRelease.get("tag_name");
-							debug("Tag name:", latestVersion);
+                                    // Current version
+                                    debug("Plugin version:", currentVersion);

-							// Current version
-							debug("Plugin version:", currentVersion);
+                                    // Compare version
+                                    hasUpdate = versionComparator.isNewer(latestVersion, currentVersion);
+                                }
+                            } catch (IOException e) {
+                                logger.severe("Failed to get latest release:" + ExceptionUtils
+                                        .getStackTrace(e));
+                                error = true;
+                            } catch (ClassCastException e) {
+                                logger.info("Unexpected structure of the result, failed to parse it");
+                                error = true;
+                            }
+                        } finally {
+                            checking = false;
+                            debug("result:", self);
+                        }
+                    }
+             ).syncLast(x -> {
+            if (callback != null) {
+                callback.run(this);
+            }
+        }).execute();
+        return this;
+    }

-							// Compare version
-							hasUpdate = versionComparator.isNewer(latestVersion, currentVersion);
-						}
-					} catch(IOException e) {
-						logger.severe("Failed to get latest release:" + ExceptionUtils.getStackTrace(e));
-						error = true;
-					} catch(ClassCastException e) {
-						logger.info("Unexpected structure of the result, failed to parse it");
-						error = true;
-					}
-				} finally {
-					checking = false;
-					debug("result:", self);
-					if(callback != null) {
-						// Switch back to main thread and call the callback
-						new BukkitRunnable() {
-							@Override
-							public void run() {
-								callback.run(self);
-							}
-						}.runTask(plugin);
-					}
-				}
-			}
-		}.runTaskAsynchronously(plugin);
-		return this;
-	}
+    /**
+     * Check if an update check is running.
+     *
+     * @return true if an update check is running
+     */
+    public boolean isChecking() {
+        return checking;
+    }

-	/**
-	 * Check if an update check is running.
-	 * @return true if an update check is running
-	 */
-	public boolean isChecking() {
-		return checking;
-	}
+    /**
+     * Check if the update check failed.
+     *
+     * @return true if the update check failed (an error message has been logged)
+     */
+    public boolean hasFailed() {
+        return error;
+    }

-	/**
-	 * Check if the update check failed.
-	 * @return true if the update check failed (an error message has been logged)
-	 */
-	public boolean hasFailed() {
-		return error;
-	}
+    /**
+     * Check if an update has been found.
+     *
+     * @return true if an update has been found
+     */
+    public boolean hasUpdate() {
+        return hasUpdate;
+    }

-	/**
-	 * Check if an update has been found.
-	 * @return true if an update has been found
-	 */
-	public boolean hasUpdate() {
-		return hasUpdate;
-	}
+    /**
+     * Get the repository that this update checker is checking.
+     *
+     * @return Used repository
+     */
+    public String getRepository() {
+        return repository;
+    }

-	/**
-	 * Get the repository that this update checker is checking.
-	 * @return Used repository
-	 */
-	public String getRepository() {
-		return repository;
-	}
+    /**
+     * Get the author that this update checker is checking.
+     *
+     * @return Used author
+     */
+    public String getAuthor() {
+        return author;
+    }

-	/**
-	 * Get the author that this update checker is checking.
-	 * @return Used author
-	 */
-	public String getAuthor() {
-		return author;
-	}
+    /**
+     * Get the current version.
+     *
+     * @return Current version of the plugin
+     */
+    public String getCurrentVersion() {
+        return currentVersion;
+    }

-	/**
-	 * Get the current version.
-	 * @return Current version of the plugin
-	 */
-	public String getCurrentVersion() {
-		return currentVersion;
-	}
+    /**
+     * Get the latest version.
+     *
+     * @return Latest version of the plugin (if checking is complete)
+     */
+    public String getLatestVersion() {
+        return latestVersion;
+    }

-	/**
-	 * Get the latest version.
-	 * @return Latest version of the plugin (if checking is complete)
-	 */
-	public String getLatestVersion() {
-		return latestVersion;
-	}
+    /**
+     * Print a debug message if DEBUG is enabled.
+     *
+     * @param message Message to print
+     */
+    private void debug(Object... message) {
+        if (DEBUG) {
+            logger.info("[" + this.getClass().getSimpleName() + "] [DEBUG] " + StringUtils
+                    .join(message, " "));
+        }
+    }

-	public interface VersionComparator {
-		/**
-		 * Check if a version should be considered 'newer' than another.
-		 * @param latestVersion  Version that is available on Github
-		 * @param currentVersion Version of the current plugin
-		 * @return true if the latestVersion is newer than the localVersion, otherwise false
-		 */
-		boolean isNewer(String latestVersion, String currentVersion);
-	}
+    @Override
+    public String toString() {
+        return "GithubUpdateCheck(" + StringUtils.join(Arrays.asList(
+                "author=" + author,
+                "repository=" + repository,
+                "plugin=" + plugin.getName(),
+                "checking=" + checking,
+                "hasUpdate=" + hasUpdate,
+                "error=" + error,
+                "currentVersion=" + currentVersion,
+                "latestVersion=" + latestVersion
+        ), ", ") + ")";
+    }

-	public interface UpdateCallback {
-		void run(GithubUpdateCheck result);
-	}
+    public interface VersionComparator {
+        /**
+         * Check if a version should be considered 'newer' than another.
+         *
+         * @param latestVersion  Version that is available on Github
+         * @param currentVersion Version of the current plugin
+         * @return true if the latestVersion is newer than the localVersion, otherwise false
+         */
+        boolean isNewer(String latestVersion, String currentVersion);
+    }

-	/**
-	 * Print a debug message if DEBUG is enabled.
-	 * @param message Message to print
-	 */
-	private void debug(Object... message) {
-		if(DEBUG) {
-			logger.info("[" + this.getClass().getSimpleName() + "] [DEBUG] " + StringUtils.join(message, " "));
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "GithubUpdateCheck(" + StringUtils.join(Arrays.asList(
-				"author=" + author,
-				"repository=" + repository,
-				"plugin=" + plugin.getName(),
-				"checking=" + checking,
-				"hasUpdate=" + hasUpdate,
-				"error=" + error,
-				"currentVersion=" + currentVersion,
-				"latestVersion=" + latestVersion
-		), ", ") + ")";
-	}
+    public interface UpdateCallback {
+        void run(GithubUpdateCheck result);
+    }
 }
@@ -3,59 +3,33 @@ package me.wiefferink.areashop.tools;
 import me.wiefferink.areashop.AreaShop;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.Tag;

 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;

 public class Materials {

-	private static boolean legacyMaterials = false;
-
-	static {
-		List<String> legacyMaterialVersions = Arrays.asList("1.7", "1.8", "1.9", "1.10", "1.11", "1.12");
-		for(String legacyMaterialVersion : legacyMaterialVersions) {
-			String version = Bukkit.getBukkitVersion();
-			// Detects '1.8', '1.8.3', '1.8-pre1' style versions
-			if(version.equals(legacyMaterialVersion)
-					|| version.startsWith(legacyMaterialVersion + ".")
-					|| version.startsWith(legacyMaterialVersion + "-")) {
-				legacyMaterials = true;
-				break;
-			}
-		}
-	}
-
-	public static final Material wallSign = get("WALL_SIGN");
-	public static final Material floorSign = get("SIGN", "SIGN_POST");
-
-	/**
-	 * Get Material version independent.
-	 * @param name Name in 1.13 and later (uppercase, with underscores)
-	 * @return Material matching the name
-	 */
-	public static Material get(String name) {
-		return get(name, null);
+	private Materials() {
 	}

 	/**
-	 * Get Material version independent.
-	 * @param name Name in 1.13 and later (uppercase, with underscores)
-	 * @param legacyName Name in 1.12 and earlier (uppercase, with underscores)
-	 * @return Material matching the name
+	 * Get material based on a sign material name.
+	 * @param name Name of the sign material
+	 * @return null if not a sign, otherwise the material matching the name (when the material is not available on the current minecraft version, it returns the base type)
 	 */
-	public static Material get(String name, String legacyName) {
-		Material result;
-		if (legacyMaterials && legacyName != null) {
-			result = Material.getMaterial(legacyName);
-		} else {
-			result = Material.getMaterial(name);
+	public static Material signNameToMaterial(String name) {
+		// Expected null case
+		if (!isSign(name)) {
+			return null;
 		}
-
-		if (result == null) {
-			AreaShop.debug("Materials.get() null result:", name, legacyName);
+		try {
+			return Material.matchMaterial(name);
+		} catch (IllegalArgumentException ignored) {
+			AreaShop.debug("Materials.get() null result:", name);
+			return null;
 		}
-
-		return result;
 	}

 	/**
@@ -64,7 +38,21 @@ public class Materials {
 	 * @return true if the given material is a sign
 	 */
 	public static boolean isSign(Material material) {
-		return material != null && material.name().contains("SIGN");
+		return Tag.SIGNS.isTagged(material) || Tag.WALL_SIGNS.isTagged(material);
+	}
+
+	/**
+	 * Check if a Material is a sign (of either the wall or floor type).
+	 * @param name String to check
+	 * @return true if the given material is a sign
+	 */
+	public static boolean isSign(String name) {
+		try {
+			return isSign(Material.matchMaterial(name));
+		} catch (IllegalArgumentException ex) {
+			AreaShop.debug("Invalid Material: " + name + " passed when performing sign check.");
+			return false;
+		}
 	}

 }
@@ -2,29 +2,29 @@ package me.wiefferink.areashop.tools;

 public class Value<T> {

-	private T value;
+	private T content;

 	/**
-	 * Create a container with a default value.
-	 * @param value The value to set
+	 * Create a container with a default content.
+	 * @param content The content to set
 	 */
-	public Value(T value) {
-		this.value = value;
+	public Value(T content) {
+		this.content = content;
 	}

 	/**
-	 * Get the stored value.
-	 * @return The stored value
+	 * Get the stored content.
+	 * @return The stored content
 	 */
 	public T get() {
-		return value;
+		return content;
 	}

 	/**
-	 * Set the value.
-	 * @param value The new value
+	 * Set the content.
+	 * @param value The new content
 	 */
 	public void set(T value) {
-		this.value = value;
+		this.content = value;
 	}
 }
@@ -10,7 +10,7 @@ general:
  # The y location within the region to start searching for safe teleport locations (x and z are in the middle of the region).
  # Possible values: 'bottom', 'middle', 'top' or a number indicating an exact y coordinate.
  teleportLocationY: bottom
-  # If true the teleportation algorithm only allows telportation to inside the region, otherwise it will expand
+  # If true the teleportation algorithm only allows teleportation to inside the region, otherwise it will expand
  # a cube from the starting point to check for safe spots (then it could end outside of the region).
  teleportIntoRegion: true
  # Same as above, but then for when you teleport to the sign of a region instead of the region itself.
@@ -414,6 +414,9 @@ add-success: "Added as %0%: [gray]%1%."
 add-failed: "Already registered: [gray]%0%."
 add-failedOtherWorld: "Already registered from another world: [gray]%0%."
 add-blacklisted: "On the blacklist: [gray]%0%."
+add-rentCancelled: "Rent cancelled: [gray]%0%."
+add-buyCancelled: "Buy cancelled: [gray]%0%."
+add-addCancelled: "Add cancelled: [gray]%0%."
 add-specifyWorld: "Specify the world of the region when using from console."
 add-incorrectWorld: "World '%0%' not found, try again (case-sensitive)."
 add-noPermissionRegions: "No permission to add: [gray]%0%."
@@ -422,6 +425,7 @@ add-noPermissionOwnerMember: "[gray]You either are not a member/owner of these r
 del-noPermission: "You don't have permission to remove regions."
 del-success: "Removed regions: [gray]%0%."
 del-failed: "No permission to remove or not registered: [gray]%0%."
+del-cancelled: "Delete cancelled: [gray]%0%."

 addsign-help: "/as addsign [region] [profile]."
 addsign-noSign: "You are not looking at a sign."
@@ -1,6 +1,6 @@
 name: AreaShop
 main: me.wiefferink.areashop.AreaShop
-version: "${project.version}${build.number}"
+version: "@version@"
 description: "Selling and renting WorldGuard regions to your players, highly configurable."
 depend: [Vault, WorldGuard, WorldEdit]
 softdepend: [Multiverse-Core, FastAsyncWorldEdit]
@@ -64,11 +64,11 @@ For a preview join 'mc.go-craft.com' and go to the Survival server, the shops ar
 Old video for AreaShop v1.0: [Tutorial by VariationVault](https://www.youtube.com/watch?v=k2HMCxCCOYo)

 ### Required dependencies
-* Java 7 or higher (latest recommended)
-* Bukkit/Spigot 1.7.9 or higher (modded servers often include Bukkit/Spigot support, so it should also work on that, but it is not specifically tested for it)
-* [WorldGuard](http://dev.bukkit.org/bukkit-plugins/worldguard/): 5.9 or higher (6.0+ recommended)
-* [WorldEdit](http://dev.bukkit.org/bukkit-plugins/worldedit/): 5.6.3 or higher (6.0+ recommended)
-* [Vault](http://dev.bukkit.org/bukkit-plugins/vault/): 1.4.1 or higher
+* Java 8 or higher (latest recommended)
+* Bukkit/Spigot 1.13.2 or higher (modded servers often include Bukkit/Spigot support, so it should also work on that, but it is not specifically tested for it)
+* [WorldGuard](http://dev.bukkit.org/bukkit-plugins/worldguard/): 7.0.3 or higher
+* [WorldEdit](http://dev.bukkit.org/bukkit-plugins/worldedit/): 7.0.1 or higher 
+* [Vault](http://dev.bukkit.org/bukkit-plugins/vault/): 1.7 or higher
 * An economy plugin supported by Vault (check the [Vault page](http://dev.bukkit.org/bukkit-plugins/vault/) for a list of these)

 ### Metrics
@@ -1 +0,0 @@
-/target
@@ -1,46 +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>
-    <artifactId>areashop-fastasyncworldedit</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop FastAsyncWorldEdit</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>1.13-R0.1-SNAPSHOT</version>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/FastAsyncWorldEdit-bukkit-1.13.132.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/FastAsyncWorldEdit-worldguard-legacy-7.0.0-SNAPSHOT-dist.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-
-    </dependencies>
-</project>
@@ -1,193 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.IncompleteRegionException;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
-import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
-import com.sk89q.worldedit.function.mask.Mask;
-import com.sk89q.worldedit.function.mask.Mask2D;
-import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
-import com.sk89q.worldedit.function.operation.Operations;
-import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.session.ClipboardHolder;
-import com.sk89q.worldedit.util.io.Closer;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import com.sk89q.worldguard.protection.regions.RegionType;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldEditSelection;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.bukkit.entity.Player;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-// Future: this class could use the schematic save/paste api of FAWE: https://github.com/boy0001/FastAsyncWorldedit/wiki/Pasting-a-schematic
-// This would not allow for shaping the schematic to a polygon region though
-public class FastAsyncWorldEditHandler extends WorldEditInterface {
-
-	public FastAsyncWorldEditHandler(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public WorldEditSelection getPlayerSelection(Player player) {
-		try {
-			Region region = pluginInterface.getWorldEdit().getSession(player).getSelection(BukkitAdapter.adapt(player.getWorld()));
-			return new WorldEditSelection(
-					player.getWorld(),
-					BukkitAdapter.adapt(player.getWorld(), region.getMinimumPoint()),
-					BukkitAdapter.adapt(player.getWorld(), region.getMaximumPoint())
-			);
-		} catch (IncompleteRegionException e) {
-			return null;
-		}
-	}
-
-	@Override
-	public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
-		// TODO implement using the FastAsyncWorldEdit api to paste async
-		File file = null;
-		ClipboardFormat format = null;
-		for (ClipboardFormat formatOption : ClipboardFormat.values()) {
-			if (new File(rawFile.getAbsolutePath() + "." + formatOption.getExtension()).exists()) {
-				file = new File(rawFile.getAbsolutePath() + "." + formatOption.getExtension());
-				format = formatOption;
-			}
-		}
-		if(file == null) {
-			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", schematic file does not exist: " + rawFile.getAbsolutePath());
-			return false;
-		}
-		pluginInterface.debugI("Trying to restore region", regionInterface.getName(), " from file", file.getAbsolutePath(), "with format", format.name());
-
-		com.sk89q.worldedit.world.World world = null;
-		if(regionInterface.getName() != null) {
-			world = BukkitAdapter.adapt(regionInterface.getWorld());
-		}
-		if(world == null) {
-			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
-			return false;
-		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
-		editSession.enableQueue();
-		ProtectedRegion region = regionInterface.getRegion();
-		// Get the origin and size of the region
-		Vector origin = new Vector(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
-
-		// Read the schematic and paste it into the world
-		try(Closer closer = Closer.create()) {
-			FileInputStream fis = closer.register(new FileInputStream(file));
-			BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
-			ClipboardReader reader = format.getReader(bis);
-
-			LocalSession session = new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
-			Clipboard clipboard = reader.read();
-			if(clipboard.getDimensions().getY() != regionInterface.getHeight()
-					|| clipboard.getDimensions().getX() != regionInterface.getWidth()
-					|| clipboard.getDimensions().getZ() != regionInterface.getDepth()) {
-				pluginInterface.getLogger().warning("Size of the region " + regionInterface.getName() + " is not the same as the schematic to restore!");
-				pluginInterface.debugI("schematic|region, x:" + clipboard.getDimensions().getX() + "|" + regionInterface.getWidth() + ", y:" + clipboard.getDimensions().getY() + "|" + regionInterface.getHeight() + ", z:" + clipboard.getDimensions().getZ() + "|" + regionInterface.getDepth());
-			}
-			clipboard.setOrigin(clipboard.getMinimumPoint());
-			ClipboardHolder clipboardHolder = new ClipboardHolder(clipboard);
-			session.setBlockChangeLimit(pluginInterface.getConfig().getInt("maximumBlocks"));
-			session.setClipboard(clipboardHolder);
-
-			// Build operation
-			BlockTransformExtent extent = new BlockTransformExtent(clipboardHolder.getClipboard());
-			ForwardExtentCopy copy = new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(), editSession, origin);
-			copy.setTransform(clipboardHolder.getTransform());
-			// Mask to region (for polygon and other weird shaped regions)
-			// TODO make this more efficient (especially for polygon regions)
-			if(region.getType() != RegionType.CUBOID) {
-				copy.setSourceMask(new Mask() {
-					@Override
-					public boolean test(Vector vector) {
-						return region.contains(vector);
-					}
-
-					@Override
-					public Mask2D toMask2D() {
-						return null;
-					}
-				});
-			}
-			Operations.completeLegacy(copy);
-		} catch(MaxChangedBlocksException e) {
-			pluginInterface.getLogger().warning("exceeded the block limit while restoring schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
-			return false;
-		} catch(IOException e) {
-			pluginInterface.getLogger().warning("An error occured while restoring schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		} catch (Exception e) {
-			pluginInterface.getLogger().warning("crashed during restore of " + regionInterface.getName());
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		}
-		editSession.flushQueue();
-		return true;
-	}
-
-	@Override
-	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
-		// TODO implement using the FastAsyncWorldEdit api to save async
-		ClipboardFormat format = ClipboardFormat.STRUCTURE;
-		// TODO allow selecting FAWE format in the config? (when enabled you cannot go back to vanilla WorldEdit easily)
-
-		file = new File(file.getAbsolutePath() + "." + format.getExtension());
-		pluginInterface.debugI("Trying to save region", regionInterface.getName(), " to file", file.getAbsolutePath(), "with format", format.name());
-		com.sk89q.worldedit.world.World world = null;
-		if(regionInterface.getWorld() != null) {
-			world = BukkitAdapter.adapt(regionInterface.getWorld());
-		}
-		if(world == null) {
-			pluginInterface.getLogger().warning("Did not save region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
-			return false;
-		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
-
-		// Create a clipboard
-		CuboidRegion selection = new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint());
-		BlockArrayClipboard clipboard = new BlockArrayClipboard(selection);
-		clipboard.setOrigin(regionInterface.getRegion().getMinimumPoint());
-		ForwardExtentCopy copy = new ForwardExtentCopy(editSession, new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint()), clipboard, regionInterface.getRegion().getMinimumPoint());
-		try {
-			Operations.completeLegacy(copy);
-		} catch(MaxChangedBlocksException e) {
-			pluginInterface.getLogger().warning("Exceeded the block limit while saving schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
-			return false;
-		}
-
-		try(Closer closer = Closer.create()) {
-			FileOutputStream fos = closer.register(new FileOutputStream(file));
-			BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
-			ClipboardWriter writer = closer.register(format.getWriter(bos));
-			writer.write(clipboard);
-		} catch(IOException e) {
-			pluginInterface.getLogger().warning("An error occured while saving schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		} catch (Exception e) {
-			pluginInterface.getLogger().warning("Crashed during save of " + regionInterface.getName());
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		}
-		return true;
-	}
-}
@@ -1,160 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.BlockVector2D;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.FlagContext;
-import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.RegionAccessSet;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.util.Vector;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-public class FastAsyncWorldEditWorldGuardHandler extends WorldGuardInterface {
-
-	public FastAsyncWorldEditWorldGuardHandler(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public RegionManager getRegionManager(World world) {
-		return WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world));
-	}
-
-	@Override
-	public Set<ProtectedRegion> getApplicableRegionsSet(Location location) {
-		Set<ProtectedRegion> result = new HashSet<>();
-		com.sk89q.worldedit.Vector vector = new com.sk89q.worldedit.Vector(location.getX(), location.getY(), location.getZ());
-		for(ProtectedRegion region : getRegionManager(location.getWorld()).getRegions().values()) {
-			if(region.contains(vector)) {
-				result.add(region);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Build a DefaultDomain from a RegionAccessSet.
-	 * @param regionAccessSet RegionAccessSet to read
-	 * @return DefaultDomain containing the entities from the RegionAccessSet
-	 */
-	private DefaultDomain buildDomain(RegionAccessSet regionAccessSet) {
-		DefaultDomain owners = new DefaultDomain();
-
-		for(String playerName : regionAccessSet.getPlayerNames()) {
-			owners.addPlayer(playerName);
-		}
-
-		for(UUID uuid : regionAccessSet.getPlayerUniqueIds()) {
-			owners.addPlayer(uuid);
-		}
-
-		for(String group : regionAccessSet.getGroupNames()) {
-			owners.addGroup(group);
-		}
-
-		return owners;
-	}
-
-	@Override
-	public void setOwners(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getOwners().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setOwners(defaultDomain);
-		}
-	}
-
-	@Override
-	public void setMembers(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getMembers().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setMembers(defaultDomain);
-		}
-	}
-
-	@Override
-	public boolean containsMember(ProtectedRegion region, UUID player) {
-		return region.getMembers().contains(player);
-	}
-
-	@Override
-	public boolean containsOwner(ProtectedRegion region, UUID player) {
-		return region.getOwners().contains(player);
-	}
-
-	@Override
-	public RegionAccessSet getMembers(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getMembers().getGroups());
-		result.getPlayerNames().addAll(region.getMembers().getPlayers());
-		result.getPlayerUniqueIds().addAll(region.getMembers().getUniqueIds());
-		return result;
-	}
-
-	@Override
-	public RegionAccessSet getOwners(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getOwners().getGroups());
-		result.getPlayerNames().addAll(region.getOwners().getPlayers());
-		result.getPlayerUniqueIds().addAll(region.getOwners().getUniqueIds());
-		return result;
-	}
-
-	@Override
-	public Flag<?> fuzzyMatchFlag(String flagName) {
-		return Flags.fuzzyMatchFlag(WorldGuard.getInstance().getFlagRegistry(), flagName);
-	}
-
-	@Override
-	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(FlagContext.create().setInput(input).build());
-	}
-
-	@Override
-	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(FlagContext.create().setInput(input).build());
-	}
-
-	@Override
-	public Vector getMinimumPoint(ProtectedRegion region) {
-		BlockVector min = region.getMinimumPoint();
-		return new Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public Vector getMaximumPoint(ProtectedRegion region) {
-		BlockVector min = region.getMaximumPoint();
-		return new Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public List<Vector> getRegionPoints(ProtectedRegion region) {
-		List<Vector> result = new ArrayList<>();
-		for (BlockVector2D point : region.getPoints()) {
-			result.add(new Vector(point.getX(), 0,point.getZ()));
-		}
-		return result;
-	}
-
-	@Override
-	public ProtectedCuboidRegion createCuboidRegion(String name, Vector corner1, Vector corner2) {
-		return new ProtectedCuboidRegion(name, new BlockVector(corner1.getBlockX(), corner1.getBlockY(), corner1.getBlockZ()), new BlockVector(corner2.getBlockX(), corner2.getBlockY(), corner2.getBlockZ()));
-	}
-}
@@ -1 +0,0 @@
-/target
@@ -1,42 +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>
-    <artifactId>areashop-interface</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop Interface</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/bukkit-1.7.9-R0.2.jar</systemPath>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldedit-6.0.0-SNAPSHOT.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
-        </dependency>
-    </dependencies>
-
-</project>
@@ -1,22 +0,0 @@
-package me.wiefferink.areashop.interfaces;
-
-import org.bukkit.entity.Player;
-
-import java.io.File;
-
-public abstract class WorldEditInterface {
-	protected final AreaShopInterface pluginInterface;
-
-	public WorldEditInterface(AreaShopInterface pluginInterface) {
-		this.pluginInterface = pluginInterface;
-	}
-
-	// Different way to restore blocks per implementation, newer ones support entities as well
-	public abstract boolean restoreRegionBlocks(File file, GeneralRegionInterface regionInterface);
-
-	// Different way to save blocks per implementation, newer ones support entities as well
-	public abstract boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface);
-
-	public abstract WorldEditSelection getPlayerSelection(Player player);
-
-}
@@ -1 +0,0 @@
-/target
@@ -1,48 +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>
-    <artifactId>areashop-worldedit-5</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop WorldEdit 5</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/craftbukkit-1.7.9-R0.2-SNAPSHOT.jar</systemPath>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldedit-5.7-SNAPSHOT.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-5.9.1-SNAPSHOT.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-</project>
@@ -1,108 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldedit.CuboidClipboard;
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.bukkit.BukkitWorld;
-import com.sk89q.worldedit.bukkit.selections.Selection;
-import com.sk89q.worldedit.data.DataException;
-import com.sk89q.worldedit.schematic.SchematicFormat;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldEditSelection;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.bukkit.entity.Player;
-
-import java.io.File;
-import java.io.IOException;
-
-public class WorldEditHandler5 extends WorldEditInterface {
-
-	public WorldEditHandler5(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public WorldEditSelection getPlayerSelection(Player player) {
-		Selection selection = pluginInterface.getWorldEdit().getSelection(player);
-		if (selection == null) {
-			return null;
-		}
-		return new WorldEditSelection(
-				player.getWorld(),
-				selection.getMinimumPoint(),
-				selection.getMaximumPoint()
-		);
-	}
-
-	@Override
-	public boolean restoreRegionBlocks(File file, GeneralRegionInterface regionInterface) {
-		file = new File(file.getAbsolutePath() + ".schematic");
-		if(!file.exists() || !file.isFile()) {
-			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", schematic file does not exist: " + file.getAbsolutePath());
-			return false;
-		}
-		boolean result = true;
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(new BukkitWorld(regionInterface.getWorld()), pluginInterface.getConfig().getInt("maximumBlocks"));
-		// Get the origin and size of the region
-		Vector origin = new Vector(regionInterface.getRegion().getMinimumPoint().getBlockX(), regionInterface.getRegion().getMinimumPoint().getBlockY(), regionInterface.getRegion().getMinimumPoint().getBlockZ());
-
-		editSession.enableQueue();
-		Exception otherException = null;
-		try {
-			CuboidClipboard clipBoard = SchematicFormat.MCEDIT.load(file);
-			if(clipBoard.getHeight() != regionInterface.getHeight()
-					|| clipBoard.getWidth() != regionInterface.getWidth()
-					|| clipBoard.getLength() != regionInterface.getDepth()) {
-				pluginInterface.getLogger().warning("Size of the region " + regionInterface.getName() + " is not the same as the schematic to restore!");
-				pluginInterface.debugI("schematic|region, x:" + clipBoard.getWidth() + "|" + regionInterface.getWidth() + ", y:" + clipBoard.getHeight() + "|" + regionInterface.getHeight() + ", z:" + clipBoard.getLength() + "|" + regionInterface.getDepth());
-			}
-			clipBoard.place(editSession, origin, false);
-		} catch(MaxChangedBlocksException e) {
-			pluginInterface.getLogger().warning("exceeded the block limit while restoring schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
-			result = false;
-		} catch(DataException | IOException e) {
-			otherException = e;
-		}
-		if(otherException != null) {
-			pluginInterface.getLogger().warning("Failed to restore schematic for region " + regionInterface.getName());
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(otherException));
-			result = false;
-		}
-		editSession.flushQueue();
-		return result;
-	}
-
-	@Override
-	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
-		file = new File(file.getAbsolutePath() + ".schematic");
-		boolean result = true;
-		ProtectedRegion region = regionInterface.getRegion();
-		// Get the origin and size of the region
-		Vector origin = new Vector(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
-		Vector size = (new Vector(region.getMaximumPoint().getBlockX(), region.getMaximumPoint().getBlockY(), region.getMaximumPoint().getBlockZ()).subtract(origin)).add(new Vector(1, 1, 1));
-		EditSession editSession = new EditSession(new BukkitWorld(regionInterface.getWorld()), pluginInterface.getConfig().getInt("maximumBlocks"));
-		// Save the schematic
-		editSession.enableQueue();
-		CuboidClipboard clipboard = new CuboidClipboard(size, origin);
-		clipboard.copy(editSession);
-		Exception otherException = null;
-		try {
-			SchematicFormat.MCEDIT.save(clipboard, file);
-		} catch(DataException | IOException e) {
-			otherException = e;
-		}
-		if(otherException != null) {
-			pluginInterface.getLogger().warning("Failed to save schematic for region " + regionInterface.getName());
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(otherException));
-			result = false;
-		}
-		editSession.flushQueue();
-		return result;
-	}
-
-
-}
@@ -1 +0,0 @@
-/target
@@ -1,48 +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>
-    <artifactId>areashop-worldedit-6</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop WorldEdit 6</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/craftbukkit-1.7.9-R0.2-SNAPSHOT.jar</systemPath>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldedit-6.0.0-SNAPSHOT.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-</project>
@@ -1,190 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.bukkit.BukkitWorld;
-import com.sk89q.worldedit.bukkit.selections.Selection;
-import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
-import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
-import com.sk89q.worldedit.function.mask.Mask;
-import com.sk89q.worldedit.function.mask.Mask2D;
-import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
-import com.sk89q.worldedit.function.operation.Operations;
-import com.sk89q.worldedit.internal.LocalWorldAdapter;
-import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.session.ClipboardHolder;
-import com.sk89q.worldedit.util.io.Closer;
-import com.sk89q.worldedit.world.registry.WorldData;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import com.sk89q.worldguard.protection.regions.RegionType;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldEditSelection;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.bukkit.entity.Player;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-public class WorldEditHandler6 extends WorldEditInterface {
-
-	public WorldEditHandler6(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public WorldEditSelection getPlayerSelection(Player player) {
-		Selection selection = pluginInterface.getWorldEdit().getSelection(player);
-		if (selection == null) {
-			return null;
-		}
-		return new WorldEditSelection(
-				player.getWorld(),
-				selection.getMinimumPoint(),
-				selection.getMaximumPoint()
-		);
-	}
-
-	@Override
-	public boolean restoreRegionBlocks(File file, GeneralRegionInterface regionInterface) {
-		file = new File(file.getAbsolutePath() + ".schematic");
-		if(!file.exists() || !file.isFile()) {
-			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", schematic file does not exist: " + file.getAbsolutePath());
-			return false;
-		}
-		com.sk89q.worldedit.world.World world = null;
-		if(regionInterface.getName() != null) {
-			world = LocalWorldAdapter.adapt(new BukkitWorld(regionInterface.getWorld()));
-		}
-		if(world == null) {
-			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
-			return false;
-		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
-		editSession.enableQueue();
-		ProtectedRegion region = regionInterface.getRegion();
-		// Get the origin and size of the region
-		Vector origin = new Vector(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
-
-		// Read the schematic and paste it into the world
-		try(Closer closer = Closer.create()) {
-			FileInputStream fis = closer.register(new FileInputStream(file));
-			BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
-			ClipboardReader reader = ClipboardFormat.SCHEMATIC.getReader(bis);
-
-			WorldData worldData = world.getWorldData();
-			LocalSession session = new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
-			Clipboard clipboard = reader.read(worldData);
-			if(clipboard.getDimensions().getY() != regionInterface.getHeight()
-					|| clipboard.getDimensions().getX() != regionInterface.getWidth()
-					|| clipboard.getDimensions().getZ() != regionInterface.getDepth()) {
-				pluginInterface.getLogger().warning("Size of the region " + regionInterface.getName() + " is not the same as the schematic to restore!");
-				pluginInterface.debugI("schematic|region, x:" + clipboard.getDimensions().getX() + "|" + regionInterface.getWidth() + ", y:" + clipboard.getDimensions().getY() + "|" + regionInterface.getHeight() + ", z:" + clipboard.getDimensions().getZ() + "|" + regionInterface.getDepth());
-			}
-			clipboard.setOrigin(clipboard.getMinimumPoint());
-			ClipboardHolder clipboardHolder = new ClipboardHolder(clipboard, worldData);
-			session.setBlockChangeLimit(pluginInterface.getConfig().getInt("maximumBlocks"));
-			session.setClipboard(clipboardHolder);
-
-			// Build operation
-			BlockTransformExtent extent = new BlockTransformExtent(clipboardHolder.getClipboard(), clipboardHolder.getTransform(), editSession.getWorld().getWorldData().getBlockRegistry());
-			ForwardExtentCopy copy = new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(), editSession, origin);
-			copy.setTransform(clipboardHolder.getTransform());
-			// Mask to region (for polygon and other weird shaped regions)
-			// TODO make this more efficient (especially for polygon regions)
-			if(region.getType() != RegionType.CUBOID) {
-				copy.setSourceMask(new Mask() {
-					@Override
-					public boolean test(Vector vector) {
-						return region.contains(vector);
-					}
-
-					@Override
-					public Mask2D toMask2D() {
-						return null;
-					}
-				});
-			}
-			Operations.completeLegacy(copy);
-		} catch(MaxChangedBlocksException e) {
-			pluginInterface.getLogger().warning("exceeded the block limit while restoring schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
-			return false;
-		} catch(IOException e) {
-			pluginInterface.getLogger().warning("An error occured while restoring schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		}
-		editSession.flushQueue();
-		return true;
-	}
-
-	@Override
-	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
-		file = new File(file.getAbsolutePath() + ".schematic");
-		com.sk89q.worldedit.world.World world = null;
-		if(regionInterface.getWorld() != null) {
-			world = LocalWorldAdapter.adapt(new BukkitWorld(regionInterface.getWorld()));
-		}
-		if(world == null) {
-			pluginInterface.getLogger().warning("Did not save region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
-			return false;
-		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
-		// Create a clipboard
-		CuboidRegion selection = new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint());
-		BlockArrayClipboard clipboard = new BlockArrayClipboard(selection);
-		clipboard.setOrigin(regionInterface.getRegion().getMinimumPoint());
-		ForwardExtentCopy copy = new ForwardExtentCopy(editSession, new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint()), clipboard, regionInterface.getRegion().getMinimumPoint());
-		try {
-			Operations.completeLegacy(copy);
-		} catch(MaxChangedBlocksException e) {
-			pluginInterface.getLogger().warning("exceeded the block limit while saving schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
-			return false;
-		}
-
-		try(Closer closer = Closer.create()) {
-			FileOutputStream fos = closer.register(new FileOutputStream(file));
-			BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
-			ClipboardWriter writer = closer.register(ClipboardFormat.SCHEMATIC.getWriter(bos));
-			writer.write(clipboard, world.getWorldData());
-		} catch(IOException e) {
-			pluginInterface.getLogger().warning("An error occured while saving schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		}
-		return true;
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1 +0,0 @@
-/target
@@ -1,46 +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>
-    <artifactId>areashop-worldedit-7_beta_1</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop WorldEdit 7_beta_1</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>1.13-R0.1-SNAPSHOT</version>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-01.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-01.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-</project>
@@ -1,228 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.IncompleteRegionException;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
-import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
-import com.sk89q.worldedit.function.mask.Mask;
-import com.sk89q.worldedit.function.mask.Mask2D;
-import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
-import com.sk89q.worldedit.function.operation.Operations;
-import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.session.ClipboardHolder;
-import com.sk89q.worldedit.util.io.Closer;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import com.sk89q.worldguard.protection.regions.RegionType;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldEditSelection;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.bukkit.entity.Player;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-public class WorldEditHandler7_beta_1 extends WorldEditInterface {
-
-	public WorldEditHandler7_beta_1(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public WorldEditSelection getPlayerSelection(Player player) {
-		try {
-			Region region = pluginInterface.getWorldEdit().getSession(player).getSelection(BukkitAdapter.adapt(player.getWorld()));
-			return new WorldEditSelection(
-					player.getWorld(),
-					BukkitAdapter.adapt(player.getWorld(), region.getMinimumPoint()),
-					BukkitAdapter.adapt(player.getWorld(), region.getMaximumPoint())
-			);
-		} catch (IncompleteRegionException e) {
-			return null;
-		}
-	}
-
-	@Override
-	public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
-		File file = null;
-		ClipboardFormat format = null;
-		for (ClipboardFormat formatOption : ClipboardFormats.getAll()) {
-			for (String extension : formatOption.getFileExtensions()) {
-				if (new File(rawFile.getAbsolutePath() + "." + extension).exists()) {
-					file = new File(rawFile.getAbsolutePath() + "." + extension);
-					format = formatOption;
-				}
-			}
-		}
-		if(file == null) {
-			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", schematic file does not exist: " + rawFile.getAbsolutePath());
-			return false;
-		}
-		pluginInterface.debugI("Trying to restore region", regionInterface.getName(), " from file", file.getAbsolutePath(), "with format", format.getName());
-
-		com.sk89q.worldedit.world.World world = null;
-		if(regionInterface.getName() != null) {
-			world = BukkitAdapter.adapt(regionInterface.getWorld());
-		}
-		if(world == null) {
-			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
-			return false;
-		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
-		editSession.enableQueue();
-		ProtectedRegion region = regionInterface.getRegion();
-		// Get the origin and size of the region
-		Vector origin = new Vector(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
-
-		// Read the schematic and paste it into the world
-		try(Closer closer = Closer.create()) {
-			FileInputStream fis = closer.register(new FileInputStream(file));
-			BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
-			ClipboardReader reader = format.getReader(bis);
-
-			//WorldData worldData = world.getWorldData();
-			LocalSession session = new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
-			Clipboard clipboard = reader.read();
-			if(clipboard.getDimensions().getY() != regionInterface.getHeight()
-					|| clipboard.getDimensions().getX() != regionInterface.getWidth()
-					|| clipboard.getDimensions().getZ() != regionInterface.getDepth()) {
-				pluginInterface.getLogger().warning("Size of the region " + regionInterface.getName() + " is not the same as the schematic to restore!");
-				pluginInterface.debugI("schematic|region, x:" + clipboard.getDimensions().getX() + "|" + regionInterface.getWidth() + ", y:" + clipboard.getDimensions().getY() + "|" + regionInterface.getHeight() + ", z:" + clipboard.getDimensions().getZ() + "|" + regionInterface.getDepth());
-			}
-			clipboard.setOrigin(clipboard.getMinimumPoint());
-			ClipboardHolder clipboardHolder = new ClipboardHolder(clipboard);
-			session.setBlockChangeLimit(pluginInterface.getConfig().getInt("maximumBlocks"));
-			session.setClipboard(clipboardHolder);
-
-			// Build operation
-			BlockTransformExtent extent = new BlockTransformExtent(clipboardHolder.getClipboard(), clipboardHolder.getTransform());
-			ForwardExtentCopy copy = new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(), editSession, origin);
-			copy.setCopyingEntities(false);
-			copy.setTransform(clipboardHolder.getTransform());
-			// Mask to region (for polygon and other weird shaped regions)
-			// TODO make this more efficient (especially for polygon regions)
-			if(region.getType() != RegionType.CUBOID) {
-				copy.setSourceMask(new Mask() {
-					@Override
-					public boolean test(Vector vector) {
-						return region.contains(vector);
-					}
-
-					@Override
-					public Mask2D toMask2D() {
-						return null;
-					}
-				});
-			}
-			Operations.completeLegacy(copy);
-		} catch(MaxChangedBlocksException e) {
-			pluginInterface.getLogger().warning("exceeded the block limit while restoring schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
-			return false;
-		} catch(IOException e) {
-			pluginInterface.getLogger().warning("An error occured while restoring schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		} catch (Exception e) {
-			pluginInterface.getLogger().warning("crashed during restore of " + regionInterface.getName());
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		}
-		editSession.flushQueue();
-		return true;
-	}
-
-	@Override
-	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
-		ClipboardFormat format = ClipboardFormats.findByAlias("sponge");
-		if(format == null) {
-			// Sponge format does not exist, try to select another one
-			for(ClipboardFormat otherFormat : ClipboardFormats.getAll()) {
-				format = otherFormat;
-			}
-			if(format == null) {
-				pluginInterface.getLogger().warning("Cannot find a format to save a schematic in, no available formats!");
-				return false;
-			}
-		}
-
-		file = new File(file.getAbsolutePath() + "." + format.getPrimaryFileExtension());
-		pluginInterface.debugI("Trying to save region", regionInterface.getName(), " to file", file.getAbsolutePath(), "with format", format.getName());
-		com.sk89q.worldedit.world.World world = null;
-		if(regionInterface.getWorld() != null) {
-			world = BukkitAdapter.adapt(regionInterface.getWorld());
-		}
-		if(world == null) {
-			pluginInterface.getLogger().warning("Did not save region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
-			return false;
-		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
-
-		// Create a clipboard
-		CuboidRegion selection = new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint());
-		BlockArrayClipboard clipboard = new BlockArrayClipboard(selection);
-		clipboard.setOrigin(regionInterface.getRegion().getMinimumPoint());
-		ForwardExtentCopy copy = new ForwardExtentCopy(editSession, new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint()), clipboard, regionInterface.getRegion().getMinimumPoint());
-		try {
-			Operations.completeLegacy(copy);
-		} catch(MaxChangedBlocksException e) {
-			pluginInterface.getLogger().warning("Exceeded the block limit while saving schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
-			return false;
-		}
-
-		try(Closer closer = Closer.create()) {
-			FileOutputStream fos = closer.register(new FileOutputStream(file));
-			BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
-			ClipboardWriter writer = closer.register(format.getWriter(bos));
-			writer.write(clipboard);
-		} catch(IOException e) {
-			pluginInterface.getLogger().warning("An error occured while saving schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		} catch (Exception e) {
-			pluginInterface.getLogger().warning("crashed during save of " + regionInterface.getName());
-			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-			return false;
-		}
-		return true;
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1 +0,0 @@
-/target
@@ -1,46 +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>
-    <artifactId>areashop-worldedit-7_beta_4</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop WorldEdit 7_beta_4</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>1.13-R0.1-SNAPSHOT</version>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-04.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-02.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-</project>
@@ -1 +0,0 @@
-/target
@@ -1,41 +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>
-    <artifactId>areashop-worldguard-5</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop WorldGuard 5</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/bukkit-1.7.9-R0.2.jar</systemPath>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-5.9.1-SNAPSHOT.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-</project>
@@ -1,172 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.BlockVector2D;
-import com.sk89q.worldedit.Vector;
-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.InvalidFlagFormat;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.RegionAccessSet;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-public class WorldGuardHandler5 extends WorldGuardInterface {
-
-	public WorldGuardHandler5(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public RegionManager getRegionManager(World world) {
-		return WorldGuardPlugin.inst().getRegionManager(world);
-	}
-
-	@Override
-	public Set<ProtectedRegion> getApplicableRegionsSet(Location location) {
-		Set<ProtectedRegion> result = new HashSet<>();
-		Vector vector = new Vector(location.getX(), location.getY(), location.getZ());
-		for(ProtectedRegion region : pluginInterface.getWorldGuard().getRegionManager(location.getWorld()).getRegions().values()) {
-			if(region.contains(vector)) {
-				result.add(region);
-			}
-		}
-		return result;
-	}
-
-	@Override
-	public void setOwners(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getOwners().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setOwners(defaultDomain);
-		}
-	}
-
-	@Override
-	public void setMembers(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getMembers().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setMembers(defaultDomain);
-		}
-	}
-
-	@Override
-	public RegionAccessSet getMembers(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getMembers().getGroups());
-		result.getPlayerNames().addAll(region.getMembers().getPlayers());
-		return result;
-	}
-
-	@Override
-	public RegionAccessSet getOwners(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getOwners().getGroups());
-		result.getPlayerNames().addAll(region.getOwners().getPlayers());
-		return result;
-	}
-
-	/**
-	 * Build a DefaultDomain from a RegionAccessSet.
-	 * @param regionAccessSet RegionAccessSet to read
-	 * @return DefaultDomain containing the entities from the RegionAccessSet
-	 */
-	private DefaultDomain buildDomain(RegionAccessSet regionAccessSet) {
-		DefaultDomain owners = new DefaultDomain();
-
-		for(String playerName : regionAccessSet.getPlayerNames()) {
-			owners.addPlayer(playerName);
-		}
-
-		// Add by name since UUIDs were not yet supported
-		for(UUID uuid : regionAccessSet.getPlayerUniqueIds()) {
-			OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(uuid);
-			if(offlinePlayer != null && offlinePlayer.getName() != null) {
-				owners.addPlayer(offlinePlayer.getName());
-			}
-		}
-
-		for(String group : regionAccessSet.getGroupNames()) {
-			owners.addGroup(group);
-		}
-
-		return owners;
-	}
-
-	@Override
-	public boolean containsMember(ProtectedRegion region, UUID player) {
-		if(player == null) {
-			return false;
-		} else {
-			String name = Bukkit.getOfflinePlayer(player).getName();
-			return name != null && region.getMembers().contains(name);
-		}
-	}
-
-	@Override
-	public boolean containsOwner(ProtectedRegion region, UUID player) {
-		if(player == null) {
-			return false;
-		} else {
-			String name = Bukkit.getOfflinePlayer(player).getName();
-			return name != null && region.getOwners().contains(name);
-		}
-	}
-
-	@Override
-	public Flag<?> fuzzyMatchFlag(String flagName) {
-		return DefaultFlag.fuzzyMatchFlag(flagName);
-	}
-
-	@Override
-	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(WorldGuardPlugin.inst(), null, input);
-	}
-
-	@Override
-	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(WorldGuardPlugin.inst(), null, input);
-	}
-
-	@Override
-	public org.bukkit.util.Vector getMinimumPoint(ProtectedRegion region) {
-		BlockVector min = region.getMinimumPoint();
-		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public org.bukkit.util.Vector getMaximumPoint(ProtectedRegion region) {
-		BlockVector min = region.getMaximumPoint();
-		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public List<org.bukkit.util.Vector> getRegionPoints(ProtectedRegion region) {
-		List<org.bukkit.util.Vector> result = new ArrayList<>();
-		for (BlockVector2D point : region.getPoints()) {
-			result.add(new org.bukkit.util.Vector(point.getX(), 0,point.getZ()));
-		}
-		return result;
-	}
-
-	@Override
-	public ProtectedCuboidRegion createCuboidRegion(String name, org.bukkit.util.Vector corner1, org.bukkit.util.Vector corner2) {
-		return new ProtectedCuboidRegion(name, new BlockVector(corner1.getBlockX(), corner1.getBlockY(), corner1.getBlockZ()), new BlockVector(corner2.getBlockX(), corner2.getBlockY(), corner2.getBlockZ()));
-	}
-}
@@ -1 +0,0 @@
-/target
@@ -1,41 +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>
-    <artifactId>areashop-worldguard-6</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop WorldGuard 6</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/bukkit-1.7.9-R0.2.jar</systemPath>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-</project>
@@ -1,158 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.BlockVector2D;
-import com.sk89q.worldedit.Vector;
-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.InvalidFlagFormat;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.RegionAccessSet;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import org.bukkit.Location;
-import org.bukkit.World;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-public class WorldGuardHandler6 extends WorldGuardInterface {
-
-	public WorldGuardHandler6(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public RegionManager getRegionManager(World world) {
-		return WorldGuardPlugin.inst().getRegionManager(world);
-	}
-
-	@Override
-	public Set<ProtectedRegion> getApplicableRegionsSet(Location location) {
-		Set<ProtectedRegion> result = new HashSet<>();
-		Vector vector = new Vector(location.getX(), location.getY(), location.getZ());
-		for(ProtectedRegion region : getRegionManager(location.getWorld()).getRegions().values()) {
-			if(region.contains(vector)) {
-				result.add(region);
-			}
-		}
-		return result;
-	}
-
-	@Override
-	public void setOwners(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getOwners().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setOwners(defaultDomain);
-		}
-	}
-
-	@Override
-	public void setMembers(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getMembers().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setMembers(defaultDomain);
-		}
-	}
-
-	@Override
-	public RegionAccessSet getMembers(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getMembers().getGroups());
-		result.getPlayerNames().addAll(region.getMembers().getPlayers());
-		result.getPlayerUniqueIds().addAll(region.getMembers().getUniqueIds());
-		return result;
-	}
-
-	@Override
-	public RegionAccessSet getOwners(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getOwners().getGroups());
-		result.getPlayerNames().addAll(region.getOwners().getPlayers());
-		result.getPlayerUniqueIds().addAll(region.getOwners().getUniqueIds());
-		return result;
-	}
-
-	/**
-	 * Build a DefaultDomain from a RegionAccessSet.
-	 * @param regionAccessSet RegionAccessSet to read
-	 * @return DefaultDomain containing the entities from the RegionAccessSet
-	 */
-	private DefaultDomain buildDomain(RegionAccessSet regionAccessSet) {
-		DefaultDomain owners = new DefaultDomain();
-
-		for(String playerName : regionAccessSet.getPlayerNames()) {
-			owners.addPlayer(playerName);
-		}
-
-		for(UUID uuid : regionAccessSet.getPlayerUniqueIds()) {
-			owners.addPlayer(uuid);
-		}
-
-		for(String group : regionAccessSet.getGroupNames()) {
-			owners.addGroup(group);
-		}
-
-		return owners;
-	}
-
-	@Override
-	public boolean containsMember(ProtectedRegion region, UUID player) {
-		return region.getMembers().contains(player);
-	}
-
-	@Override
-	public boolean containsOwner(ProtectedRegion region, UUID player) {
-		return region.getOwners().contains(player);
-	}
-
-	@Override
-	public Flag<?> fuzzyMatchFlag(String flagName) {
-		return DefaultFlag.fuzzyMatchFlag(flagName);
-	}
-
-	@Override
-	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(WorldGuardPlugin.inst(), null, input);
-	}
-
-	@Override
-	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(WorldGuardPlugin.inst(), null, input);
-	}
-
-	@Override
-	public org.bukkit.util.Vector getMinimumPoint(ProtectedRegion region) {
-		BlockVector min = region.getMinimumPoint();
-		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public org.bukkit.util.Vector getMaximumPoint(ProtectedRegion region) {
-		BlockVector min = region.getMaximumPoint();
-		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public List<org.bukkit.util.Vector> getRegionPoints(ProtectedRegion region) {
-		List<org.bukkit.util.Vector> result = new ArrayList<>();
-		for (BlockVector2D point : region.getPoints()) {
-			result.add(new org.bukkit.util.Vector(point.getX(), 0,point.getZ()));
-		}
-		return result;
-	}
-
-	@Override
-	public ProtectedCuboidRegion createCuboidRegion(String name, org.bukkit.util.Vector corner1, org.bukkit.util.Vector corner2) {
-		return new ProtectedCuboidRegion(name, new BlockVector(corner1.getBlockX(), corner1.getBlockY(), corner1.getBlockZ()), new BlockVector(corner2.getBlockX(), corner2.getBlockY(), corner2.getBlockZ()));
-	}
-}
@@ -1 +0,0 @@
-/target
@@ -1,49 +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>
-    <artifactId>areashop-worldguard-6_1_3</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop WorldGuard 6_1_3</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/bukkit-1.7.9-R0.2.jar</systemPath>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q.worldguard</groupId>
-            <artifactId>worldguard-legacy</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-6.1.3-SNAPSHOT.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-6</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-</project>
@@ -1,32 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-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 me.wiefferink.areashop.interfaces.AreaShopInterface;
-
-public class WorldGuardHandler6_1_3 extends WorldGuardHandler6 {
-
-	public WorldGuardHandler6_1_3(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public Flag<?> fuzzyMatchFlag(String flagName) {
-		return DefaultFlag.fuzzyMatchFlag(WorldGuardPlugin.inst().getFlagRegistry(), flagName);
-	}
-
-	@Override
-	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(FlagContext.create().setInput(input).build());
-	}
-
-	@Override
-	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(FlagContext.create().setInput(input).build());
-	}
-}
@@ -1 +0,0 @@
-/target
@@ -1,47 +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>
-    <artifactId>areashop-worldguard-7_beta_1</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop WorldGuard 7_beta_1</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>1.13-R0.1-SNAPSHOT</version>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-01.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-01.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-</project>
@@ -1,160 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.BlockVector2D;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.FlagContext;
-import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.RegionAccessSet;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import org.bukkit.Location;
-import org.bukkit.World;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-public class WorldGuardHandler7_beta_1 extends WorldGuardInterface {
-
-	public WorldGuardHandler7_beta_1(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public RegionManager getRegionManager(World world) {
-		return WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world));
-	}
-
-	@Override
-	public Set<ProtectedRegion> getApplicableRegionsSet(Location location) {
-		Set<ProtectedRegion> result = new HashSet<>();
-		Vector vector = new Vector(location.getX(), location.getY(), location.getZ());
-		for(ProtectedRegion region : getRegionManager(location.getWorld()).getRegions().values()) {
-			if(region.contains(vector)) {
-				result.add(region);
-			}
-		}
-		return result;
-	}
-
-	@Override
-	public void setOwners(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getOwners().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setOwners(defaultDomain);
-		}
-	}
-
-	@Override
-	public void setMembers(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getMembers().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setMembers(defaultDomain);
-		}
-	}
-
-	@Override
-	public RegionAccessSet getMembers(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getMembers().getGroups());
-		result.getPlayerNames().addAll(region.getMembers().getPlayers());
-		result.getPlayerUniqueIds().addAll(region.getMembers().getUniqueIds());
-		return result;
-	}
-
-	@Override
-	public RegionAccessSet getOwners(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getOwners().getGroups());
-		result.getPlayerNames().addAll(region.getOwners().getPlayers());
-		result.getPlayerUniqueIds().addAll(region.getOwners().getUniqueIds());
-		return result;
-	}
-
-	/**
-	 * Build a DefaultDomain from a RegionAccessSet.
-	 * @param regionAccessSet RegionAccessSet to read
-	 * @return DefaultDomain containing the entities from the RegionAccessSet
-	 */
-	private DefaultDomain buildDomain(RegionAccessSet regionAccessSet) {
-		DefaultDomain owners = new DefaultDomain();
-
-		for(String playerName : regionAccessSet.getPlayerNames()) {
-			owners.addPlayer(playerName);
-		}
-
-		for(UUID uuid : regionAccessSet.getPlayerUniqueIds()) {
-			owners.addPlayer(uuid);
-		}
-
-		for(String group : regionAccessSet.getGroupNames()) {
-			owners.addGroup(group);
-		}
-
-		return owners;
-	}
-
-	@Override
-	public boolean containsMember(ProtectedRegion region, UUID player) {
-		return region.getMembers().contains(player);
-	}
-
-	@Override
-	public boolean containsOwner(ProtectedRegion region, UUID player) {
-		return region.getOwners().contains(player);
-	}
-
-	@Override
-	public Flag<?> fuzzyMatchFlag(String flagName) {
-		return Flags.fuzzyMatchFlag(WorldGuard.getInstance().getFlagRegistry(), flagName);
-	}
-
-	@Override
-	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(FlagContext.create().setInput(input).build());
-	}
-
-	@Override
-	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(FlagContext.create().setInput(input).build());
-	}
-
-	@Override
-	public org.bukkit.util.Vector getMinimumPoint(ProtectedRegion region) {
-		BlockVector min = region.getMinimumPoint();
-		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public org.bukkit.util.Vector getMaximumPoint(ProtectedRegion region) {
-		BlockVector min = region.getMaximumPoint();
-		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public List<org.bukkit.util.Vector> getRegionPoints(ProtectedRegion region) {
-		List<org.bukkit.util.Vector> result = new ArrayList<>();
-		for (BlockVector2D point : region.getPoints()) {
-			result.add(new org.bukkit.util.Vector(point.getX(), 0,point.getZ()));
-		}
-		return result;
-	}
-
-	@Override
-	public ProtectedCuboidRegion createCuboidRegion(String name, org.bukkit.util.Vector corner1, org.bukkit.util.Vector corner2) {
-		return new ProtectedCuboidRegion(name, new BlockVector(corner1.getBlockX(), corner1.getBlockY(), corner1.getBlockZ()), new BlockVector(corner2.getBlockX(), corner2.getBlockY(), corner2.getBlockZ()));
-	}
-}
@@ -1 +0,0 @@
-/target
@@ -1,47 +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>
-    <artifactId>areashop-worldguard-7_beta_2</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop WorldGuard 7_beta_2</name>
-    <version>latest</version>
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>1.13-R0.1-SNAPSHOT</version>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-04.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-02.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-</project>
@@ -0,0 +1,50 @@
+plugins {
+    id 'java'
+}
+
+group = "me.wiefferink.areashop"
+version = '2.6.4'
+
+subprojects {
+
+    plugins.apply('java')
+
+    repositories {
+        mavenCentral()
+        maven {
+            name = 'paper-repo'
+            url = uri('https://papermc.io/repo/repository/maven-public/')
+        }
+        maven {
+            name = 'spigot-repo'
+            url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
+        }
+        maven {
+            name = 'jitpack'
+            url = uri('https://jitpack.io')
+            content {
+                includeGroupByRegex("com\\.github.*")
+            }
+        }
+        maven {
+            name = 'aikar-repo'
+            url = uri('https://repo.aikar.co/content/groups/aikar/')
+        }
+        maven {
+            name = 'enginehub-repo'
+            url = uri('https://maven.enginehub.org/repo/')
+        }
+    }
+
+    tasks.withType(JavaCompile) {
+        tasks.withType(JavaCompile) {
+            javaToolchains.compilerFor {
+                JavaLanguageVersion.of(16)
+            }
+            options.release.set(16)
+            options.encoding = 'UTF-8'
+            options.fork = true
+            options.deprecation = true
+        }
+    }
+}
@@ -1,7 +1,7 @@
 <?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">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">

 <!--
    Based on the Google Java Style Guide: https://google.github.io/styleguide/javaguide.html
@@ -42,9 +42,7 @@
            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
        </module>
        <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="100"/>
-        </module>
+        <module name="LeftCurly" />
        <module name="RightCurly">
            <property name="id" value="RightCurlySame"/>
            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_DO"/>
Author	SHA1	Message	Date
Andrew Wong	b50d57739f	Bump version	2021-08-16 13:30:46 +02:00
Andrew Wong	ce9438eaeb	Fix compile errors in the fawe 1.17 module	2021-08-16 13:26:50 +02:00
Andrew Wong	47cc259c40	Fix startup errors, bump fawe version	2021-08-16 13:23:26 +02:00
Andrew Wong	e6ae122b86	Fix missing version	2021-06-29 22:38:59 +02:00
Andrew Wong	2562075b90	Add fawe module for 1.17	2021-06-24 17:25:14 +02:00
Andrew Wong	9fc5d8a314	Add support for 1.17	2021-06-23 14:24:15 +02:00
Andrew Wong	e96b179c48	Performance improvements and bug fixes to sign	2021-06-23 14:20:05 +02:00
Andrew Wong	49bed6f655	Use the updated method of making an edit session	2021-06-23 13:45:15 +02:00
Andrew Wong	ffc5b03a75	Fix merge conflicts	2021-06-23 13:43:23 +02:00
Andrew Wong	69fea8ab7e	Fix merge conflicts	2021-06-23 12:38:45 +02:00
Andrew Wong	29fc2c4205	Move maven things to gradle	2021-06-23 12:23:06 +02:00
Andrew Wong	2dd6d4ec4a	Don't use deprecated methods in WorldGuard and WorldEdit handlers	2021-06-23 11:45:00 +02:00
Andrew Wong	789073f6d6	Bump worldedit and worldguard versions	2021-06-23 11:41:04 +02:00
Andrew Wong	d211bf2f43	Move compat to 1.16	2021-06-23 11:16:02 +02:00
Andrew Wong	a6659cb14d	Remove bstats	2021-06-23 10:58:20 +02:00
Andrew Wong	880218cca0	Bump gradle to 7.1 and java version to 16	2021-06-23 10:47:05 +02:00
Andrew Wong	3426381273	Gradleise	2021-06-04 14:45:00 +02:00
Andrew Wong	80a73fecea	Load invalid region files when trying to delete them	2021-06-04 13:24:33 +02:00
Andrew Wong	590d5a4988	Fix names and pom	2021-06-03 12:24:35 +02:00
Andrew Wong	dda4a090fb	Fix merge conflicts	2021-06-03 12:24:17 +02:00
Andrew Wong	3a415513dd	Fix tab completions	2021-01-18 19:02:34 +01:00
Andrew Wong	8ec6a43dc8	Update the fawe hook	2020-11-04 17:38:24 +01:00
Andrew Wong	2d81614f5f	Update the fawe hook	2020-11-04 17:34:43 +01:00
Andrew Wong	8fb035015d	Cache rent and buy regions in a seperate map in FileManager	2020-11-04 17:19:14 +01:00
Andrew Wong	77088a3a72	Performance improvements	2020-11-04 16:38:13 +01:00
Andrew Wong	2c2f40b0ea	Fix merge conflict	2020-09-25 16:55:13 +02:00
Andrew Wong	07406c3987	Improve the performance of TeleportFeature#teleportPlayer Split chunk loading accross multiple ticks, delay 3 ticks before executing teleport logic	2020-09-25 13:01:09 +02:00
Andrew Wong	82a90b350d	Minor bug fixes	2020-08-22 01:37:33 +02:00
Andrew Wong	151fbe8000	Move away from using BukkitDo; Add TaskChain as a dependency	2020-08-17 21:47:44 +02:00
Andrew Wong	f2a4dd71e3	Update README.md	2020-08-16 23:44:06 +02:00
Andrew Wong	d4cc70f954	Rename version	2020-08-16 23:41:56 +02:00
Andrew Wong	8001047480	Add in the spigot repo	2020-08-16 23:31:29 +02:00
Andrew Wong	af1486a6fa	Create maven.yml	2020-08-16 23:27:40 +02:00
Andrew Wong	36a2d054d6	Bump maven plugin versions	2020-08-16 23:24:37 +02:00
Andrew Wong	7429b0a206	Remove system dependencies. Utilise PaperLib when teleporting. Remove support for pre-1.13. Added support for 1.16.1	2020-08-16 23:17:08 +02:00
dependabot[bot]	557d11dfb4	Bump checkstyle from 8.21 to 8.29 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.21 to 8.29. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.21...checkstyle-8.29) Signed-off-by: dependabot[bot] <support@github.com>	2020-02-26 11:02:43 +01:00
Thijs Wiefferink	b9547e2c67	Remove github action experiment	2019-08-16 18:22:19 +02:00
Thijs Wiefferink	221785ae55	Add test workflow maven build	2019-08-16 17:42:22 +02:00
Thijs Wiefferink	0d04676bce	Fix including bukkit into the AreaShop jar	2019-06-23 22:27:35 +02:00
Thijs Wiefferink	c8cd68c17b	Fixup javadoc build	2019-06-23 22:07:34 +02:00
Thijs Wiefferink	539887449c	pom.xml: build with craftbukkit 1.13	2019-06-23 21:59:04 +02:00
Thijs Wiefferink	4cda8a9292	Fix sign handling for 1.14 - Setup modules to load different classes for different Bukkit/Spigot versions - Create BukkitHandler to get/set the sign facing and get the block it is attached to - Fix `/as addsign` to use new sign methods - Fix sign updates to use new sign methods - Implement full forwards and backwards compatibility of the saved sign material type - On Bukkit 1.12 and lower all special wood types are translated to the standard sign - On Bukkit 1.13 the internal sign name is translated (and special wood types to the standard one) - On Bukkit 1.14 the signs of 1.13- are translated to the OAK variants - Cleanup the .gitignore files inside of the module folders	2019-06-23 21:53:48 +02:00
Thijs Wiefferink	fe131dc157	BuyRegion/RentRegion: fix %player% placeholders for selling/unrenting confirmation messages	2019-06-16 21:40:58 +02:00
Thijs Wiefferink	41ced9ee6c	Update checkstyle from 7.6 to 8.21	2019-06-01 17:08:30 +02:00
Thijs Wiefferink	03de0ff252	default.yml: fix spelling mistake	2019-06-01 16:24:15 +02:00
Thijs Wiefferink	b057271394	Fix permission check of `/as rent`, fix 'already bought' check of `/as buy`	2019-02-20 19:33:37 +01:00
Thijs Wiefferink	d7cdff0b22	/as setteleport: fix check that hides it from `/as help`	2019-02-08 22:29:57 +01:00
Thijs Wiefferink	1035b6b41b	Move event commands to a feature class, add two events - Move eventCommandProfile code to a separate class - Add AddingRegionEvent - Add DeletingRegionEvent - Cleanup a couple of duplicate code paths (merge RentRegion/BuyRegion branches)	2019-01-28 23:37:43 +01:00
Thijs Wiefferink	e0bad7397c	Refactoring based on SonarLint and Intellij IDEA inspections	2019-01-26 21:23:49 +01:00
Thijs Wiefferink	b7124e8cdd	Remove mcstats.org metrics class, I don't believe they will be online again	2019-01-26 20:11:26 +01:00
Thijs Wiefferink	f0952c32c9	Update issue templates Add 'NEW' label to issues created using the template	2019-01-13 22:26:54 +01:00