Bug fixes

Change some "hot" code which would call Bukkit#getOfflinePlayer sync.
Utilise inheritance better; Introduce the TransactionalRegion class.

AreaShop/pom.xml

@@ -11,7 +11,7 @@
     <artifactId>areashop</artifactId>
     <packaging>jar</packaging>
     <name>AreaShop</name>
-    <version>2.6.2</version> <!-- Main plugin version -->
+    <version>2.7.1-SNAPSHOT</version> <!-- Main plugin version -->
 
     <repositories>
         <repository>
@@ -47,10 +47,19 @@
             <version>3.7.2</version>
         </dependency>
 
+        <!-- JetBrains Annotations -->
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>19.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Paper Lib -->
         <dependency>
             <groupId>io.papermc</groupId>
             <artifactId>paperlib</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5</version>
         </dependency>
 
         <!-- WorldEdit/WorldGuard -->
@@ -112,7 +121,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.1</version>
+            <version>1.6</version>
             <scope>compile</scope>
         </dependency>
 
@@ -263,10 +272,16 @@
                                     <pattern>org.bstats</pattern>
                                     <shadedPattern>me.wiefferink.areashop.shaded.bstats</shadedPattern>
                                 </relocation>
+                                <!-- Relocate PaperLib -->
                                 <relocation>
                                     <pattern>io.papermc</pattern>
                                     <shadedPattern>me.wiefferink.areashop.shaded.paperlib</shadedPattern>
                                 </relocation>
+                                <!-- Relocate Google Guice & Guice-Assisted-Inject -->
+                                <relocation>
+                                    <pattern>com.google.inject</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.inject</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>

AreaShop/src/main/java/me/wiefferink/areashop/AreaShop.java

@@ -4,6 +4,7 @@ import co.aikar.taskchain.BukkitTaskChainFactory;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.managers.RegionManager;
+import me.wiefferink.areashop.commands.TestCommand;
 import me.wiefferink.areashop.interfaces.AreaShopInterface;
 import me.wiefferink.areashop.interfaces.WorldEditInterface;
 import me.wiefferink.areashop.interfaces.WorldGuardInterface;
@@ -338,7 +339,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
     public Economy getEconomy() {
         RegisteredServiceProvider<Economy> economy = getServer().getServicesManager()
                 .getRegistration(net.milkbowl.vault.economy.Economy.class);
-        if (economy == null || economy.getProvider() == null) {
+        if (economy == null) {
             error(
                     "There is no economy provider to support Vault, make sure you installed an economy plugin");
             return null;
@@ -570,6 +571,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
     public void onEnable() {
         AreaShop.instance = this;
         Utils.factory = BukkitTaskChainFactory.create(this);
+        getCommand("test").setExecutor(new TestCommand());
         managers = new HashSet<>();
         boolean error = !loadHooks();
 
@@ -681,6 +683,22 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
             return true;
         }
         final String packageName = "me.wiefferink.areashop.handlers.";
+        final Plugin fawe = getServer().getPluginManager().getPlugin("FastAsyncWorldEdit");
+        if (fawe != null && fawe.isEnabled()) {
+            final String version = fawe.getDescription().getVersion();
+            if (version.startsWith("1.15") || version.startsWith("1.16")) {
+                try {
+                    this.worldEditInterface = (WorldEditInterface) Class.forName(packageName + "fawe.v1_15.FastAsyncWorldEditHandler")
+                            .getDeclaredConstructor(AreaShopInterface.class).newInstance(this);
+                } catch (ReflectiveOperationException ex) {
+                    getLogger().log(Level.SEVERE, "Failed to hook into FAWE!");
+                    ex.printStackTrace();
+                }
+            }
+            if (this.worldEditInterface == null) {
+                info("FAWE Version: " + version + " detected, no compatible handler found. Using the WorldEdit handler instead.");
+            }
+        }
         if (this.worldEditInterface == null) {
             final String version = worldEdit.getDescription().getVersion();
             Matcher matcher = VERSION_MATCHER_3.matcher(version);
@@ -702,23 +720,6 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
                 return false;
             }
         }
-        this.worldEdit = (WorldEditPlugin) worldEdit;
-        final Plugin fawe = getServer().getPluginManager().getPlugin("FastAsyncWorldEdit");
-        if (fawe != null && fawe.isEnabled()) {
-            final String version = fawe.getDescription().getVersion();
-            if (version.startsWith("1.15") || version.startsWith("1.16")) {
-                try {
-                    this.worldEditInterface = (WorldEditInterface) Class.forName(packageName + "fawe.v1_15.FastAsyncWorldEditHandler")
-                            .getDeclaredConstructor(AreaShopInterface.class).newInstance(this);
-                } catch (ReflectiveOperationException ex) {
-                    getLogger().log(Level.SEVERE, "Failed to hook into FAWE!");
-                    ex.printStackTrace();
-                }
-            }
-            if (this.worldEditInterface == null) {
-                info("FAWE Version: " + version + " detected, no compatible handler found. Using the WorldEdit handler instead.");
-            }
-        }
         final String wgVersion = worldGuard.getDescription().getVersion();
         Matcher matcher = VERSION_MATCHER_3.matcher(wgVersion);
         if (!matcher.find()) {

AreaShop/src/main/java/me/wiefferink/areashop/commands/AddCommand.java

@@ -125,7 +125,7 @@ public class AddCommand extends CommandAreaShop {
 		TreeSet<String> namesNoPermission = new TreeSet<>();
 		TreeSet<String> namesAddCancelled = new TreeSet<>(); // Denied by an event listener
 		Utils.runAsBatches(regions.entrySet(),
-			Math.min(plugin.getConfig().getInt("adding.regionsPerTick"), 1),
+			plugin.getConfig().getInt("adding.regionsPerTick"),
 				(regionEntry) -> {
 				String regionName = regionEntry.getKey();
 				ProtectedRegion region = regionEntry.getValue();

AreaShop/src/main/java/me/wiefferink/areashop/commands/CommandAreaShop.java

@@ -89,7 +89,7 @@ public abstract class CommandAreaShop {
 		return false;
 	}
 
-	private class CommandTime {
+	private static class CommandTime {
 		public final String command;
 		public final long time;
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/DelCommand.java

@@ -51,7 +51,7 @@ public class DelCommand extends CommandAreaShop {
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions.isEmpty()) {
+			if(regions == null || regions.isEmpty()) {
 				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}

AreaShop/src/main/java/me/wiefferink/areashop/commands/FindCommand.java

@@ -112,7 +112,7 @@ public class FindCommand extends CommandAreaShop {
 		// Find rental regions
 		else {
 			List<RentRegion> regions = plugin.getFileManager().getRents();
-			List<RentRegion> results = new ArrayList<>();
+			List<RentRegion> results = new ArrayList<>(regions.size());
 			for(RentRegion region : regions) {
 				if(!region.isRented()
 						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))

AreaShop/src/main/java/me/wiefferink/areashop/commands/ImportJob.java

@@ -259,7 +259,7 @@ public class ImportJob {
 				if(owner != null) {
 					@SuppressWarnings("deprecation")
 					OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
-					if(offlinePlayer != null) {
+					if(offlinePlayer.hasPlayedBefore()) {
 						existing.add(offlinePlayer.getUniqueId());
 					}
 				}
@@ -338,9 +338,7 @@ public class ImportJob {
 
 		// Determine unit and add that to the price
 		String unitSuffix = "";
-		if("region".equalsIgnoreCase(unit)) {
-			// add nothing
-		} else if("m3".equalsIgnoreCase(unit)) {
+		if("m3".equalsIgnoreCase(unit)) {
 			unitSuffix = "*%volume%";
 		} else { // m2 or nothing (in case not set, we should actually look in parent files to correctly set this...)
 			unitSuffix = "*(%volume%/%height%)"; // This is better than width*depth because of polygon regions

AreaShop/src/main/java/me/wiefferink/areashop/commands/InfoCommand.java

@@ -10,11 +10,7 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 // TODO fix '/as info' help message hitting replacement limit (improve depth tracking?)
 // TODO add info about autoExtend
@@ -62,7 +58,7 @@ public class InfoCommand extends CommandAreaShop {
 		} else {
 			// First sort by type, then by name
 			regions.sort((one, two) -> {
-				int typeCompare = getTypeOrder(two).compareTo(getTypeOrder(one));
+				int typeCompare = Integer.compare(getTypeOrder(two), getTypeOrder(one));
 				if(typeCompare != 0) {
 					return typeCompare;
 				} else {
@@ -86,20 +82,22 @@ public class InfoCommand extends CommandAreaShop {
 			for(int i = (page - 1) * itemsPerPage; i < page * itemsPerPage && i < regions.size(); i++) {
 				String state;
 				GeneralRegion region = regions.get(i);
-				if(region.getType() == GeneralRegion.RegionType.RENT) {
-					if(region.getOwner() == null) {
+				if(region instanceof RentRegion) {
+					if(region.isAvailable()) {
 						state = "Forrent";
 					} else {
 						state = "Rented";
 					}
-				} else {
-					if(region.getOwner() == null) {
+				} else if (region instanceof BuyRegion){
+					if(region.isAvailable()) {
 						state = "Forsale";
 					} else if(!((BuyRegion)region).isInResellingMode()) {
 						state = "Sold";
 					} else {
 						state = "Reselling";
 					}
+				} else {
+					state = region.getState().getValue();
 				}
 				plugin.messageNoPrefix(sender, "info-entry" + state, region);
 				linesPrinted++;
@@ -137,15 +135,15 @@ public class InfoCommand extends CommandAreaShop {
 	 * @param region The region to get the order for
 	 * @return An integer for sorting by type
 	 */
-	private Integer getTypeOrder(GeneralRegion region) {
+	private int getTypeOrder(GeneralRegion region) {
 		if(region.getType() == GeneralRegion.RegionType.RENT) {
-			if(region.getOwner() == null) {
+			if(region.isAvailable()) {
 				return 1;
 			} else {
 				return 2;
 			}
 		} else {
-			if(region.getOwner() == null) {
+			if(region.isAvailable()) {
 				return 3;
 			} else if(!((BuyRegion)region).isInResellingMode()) {
 				return 4;
@@ -230,205 +228,201 @@ public class InfoCommand extends CommandAreaShop {
 
 			// Region info
 			else if(args[1].equalsIgnoreCase("region")) {
-				if(args.length > 1) {
-					RentRegion rent = null;
-					BuyRegion buy = null;
-					if(args.length > 2) {
-						rent = plugin.getFileManager().getRent(args[2]);
-						buy = plugin.getFileManager().getBuy(args[2]);
-					} else {
-						if(sender instanceof Player) {
-							// get the region by location
-							List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
-							if(regions.isEmpty()) {
-								plugin.message(sender, "cmd-noRegionsAtLocation");
-								return;
-							} else if(regions.size() > 1) {
-								plugin.message(sender, "cmd-moreRegionsAtLocation");
-								return;
-							} else {
-								if(regions.get(0) instanceof RentRegion) {
-									rent = (RentRegion)regions.get(0);
-								} else if(regions.get(0) instanceof BuyRegion) {
-									buy = (BuyRegion)regions.get(0);
-								}
-							}
-						} else {
-							plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				RentRegion rent = null;
+				BuyRegion buy = null;
+				if(args.length > 2) {
+					rent = plugin.getFileManager().getRent(args[2]);
+					buy = plugin.getFileManager().getBuy(args[2]);
+				} else {
+					if(sender instanceof Player) {
+						// get the region by location
+						List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+						if(regions.isEmpty()) {
+							plugin.message(sender, "cmd-noRegionsAtLocation");
 							return;
+						} else if(regions.size() > 1) {
+							plugin.message(sender, "cmd-moreRegionsAtLocation");
+							return;
+						} else {
+							if(regions.get(0) instanceof RentRegion) {
+								rent = (RentRegion)regions.get(0);
+							} else if(regions.get(0) instanceof BuyRegion) {
+								buy = (BuyRegion)regions.get(0);
+							}
 						}
-					}
-
-					if(rent == null && buy == null) {
-						plugin.message(sender, "info-regionNotExisting", args[2]);
+					} else {
+						plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 						return;
 					}
+				}
 
-					if(rent != null) {
-						plugin.message(sender, "info-regionHeaderRent", rent);
-						if(rent.isRented()) {
-							plugin.messageNoPrefix(sender, "info-regionRented", rent);
-							plugin.messageNoPrefix(sender, "info-regionExtending", rent);
-							// Money back
-							if(UnrentCommand.canUse(sender, rent)) {
-								plugin.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
-							} else {
-								plugin.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
-							}
-							// Friends
-							if(!rent.getFriendsFeature().getFriendNames().isEmpty()) {
-								String messagePart = "info-friend";
-								if(DelfriendCommand.canUse(sender, rent)) {
-									messagePart = "info-friendRemove";
-								}
-								plugin.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
-							}
+				if(rent == null && buy == null) {
+					plugin.message(sender, "info-regionNotExisting", args[2]);
+					return;
+				}
+
+				if(rent != null) {
+					plugin.message(sender, "info-regionHeaderRent", rent);
+					if(rent.isRented()) {
+						plugin.messageNoPrefix(sender, "info-regionRented", rent);
+						plugin.messageNoPrefix(sender, "info-regionExtending", rent);
+						// Money back
+						if(UnrentCommand.canUse(sender, rent)) {
+							plugin.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
 						} else {
-							plugin.messageNoPrefix(sender, "info-regionCanBeRented", rent);
+							plugin.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
 						}
-						if(rent.getLandlordName() != null) {
-							plugin.messageNoPrefix(sender, "info-regionLandlord", rent);
-						}
-						// Maximum extends
-						if(rent.getMaxExtends() != -1) {
-							if(rent.getMaxExtends() == 0) {
-								plugin.messageNoPrefix(sender, "info-regionNoExtending", rent);
-							} else if(rent.isRented()) {
-								plugin.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
-							} else {
-								plugin.messageNoPrefix(sender, "info-regionMaxExtends", rent);
+						// Friends
+						if(!rent.getFriendsFeature().getFriendNames().isEmpty()) {
+							String messagePart = "info-friend";
+							if(DelfriendCommand.canUse(sender, rent)) {
+								messagePart = "info-friendRemove";
 							}
+							plugin.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
 						}
-						// If maxExtends is zero it does not make sense to show this message
-						if(rent.getMaxRentTime() != -1 && rent.getMaxExtends() != 0) {
-							plugin.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
-						}
-						if(rent.getInactiveTimeUntilUnrent() != -1) {
-							plugin.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
-						}
-						// Teleport
-						Message tp = Message.fromKey("info-prefix");
-						boolean foundSomething = false;
-						if(TeleportCommand.canUse(sender, rent)) {
-							foundSomething = true;
-							tp.append(Message.fromKey("info-regionTeleport").replacements(rent));
-						}
-						if(SetteleportCommand.canUse(sender, rent)) {
-							if(foundSomething) {
-								tp.append(", ");
-							}
-							foundSomething = true;
-							tp.append(Message.fromKey("info-setRegionTeleport").replacements(rent));
-						}
-						if(foundSomething) {
-							tp.append(".");
-							tp.send(sender);
-						}
-						// Signs
-						List<String> signLocations = new ArrayList<>();
-						for(Location location : rent.getSignsFeature().getSignLocations()) {
-							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
-						}
-						if(!signLocations.isEmpty()) {
-							plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
-						}
-						// Groups
-						if(sender.hasPermission("areashop.groupinfo") && !rent.getGroupNames().isEmpty()) {
-							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
-						}
-						// Restoring
-						if(rent.isRestoreEnabled()) {
-							plugin.messageNoPrefix(sender, "info-regionRestoringRent", rent);
-						}
-						// Restrictions
-						if(!rent.isRented()) {
-							if(rent.restrictedToRegion()) {
-								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
-							} else if(rent.restrictedToWorld()) {
-								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
-							}
-						}
-						plugin.messageNoPrefix(sender, "info-regionFooterRent", rent);
-					} else if(buy != null) {
-						plugin.message(sender, "info-regionHeaderBuy", buy);
-						if(buy.isSold()) {
-							if(buy.isInResellingMode()) {
-								plugin.messageNoPrefix(sender, "info-regionReselling", buy);
-								plugin.messageNoPrefix(sender, "info-regionReselPrice", buy);
-							} else {
-								plugin.messageNoPrefix(sender, "info-regionBought", buy);
-							}
-							// Money back
-							if(!buy.getBooleanSetting("buy.sellDisabled")) {
-								if (SellCommand.canUse(sender, buy)) {
-									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
-								} else {
-									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
-								}
-							}
-							// Friends
-							if(!buy.getFriendsFeature().getFriendNames().isEmpty()) {
-								String messagePart = "info-friend";
-								if(DelfriendCommand.canUse(sender, buy)) {
-									messagePart = "info-friendRemove";
-								}
-								plugin.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
-							}
-						} else {
-							plugin.messageNoPrefix(sender, "info-regionCanBeBought", buy);
-						}
-						if(buy.getLandlord() != null) {
-							plugin.messageNoPrefix(sender, "info-regionLandlord", buy);
-						}
-						if(buy.getInactiveTimeUntilSell() != -1) {
-							plugin.messageNoPrefix(sender, "info-regionInactiveSell", buy);
-						}
-						// Teleport
-						Message tp = Message.fromKey("info-prefix");
-						boolean foundSomething = false;
-						if(TeleportCommand.canUse(sender, buy)) {
-							foundSomething = true;
-							tp.append(Message.fromKey("info-regionTeleport").replacements(buy));
-						}
-						if(SetteleportCommand.canUse(sender, buy)) {
-							if(foundSomething) {
-								tp.append(", ");
-							}
-							foundSomething = true;
-							tp.append(Message.fromKey("info-setRegionTeleport").replacements(buy));
-						}
-						if(foundSomething) {
-							tp.append(".");
-							tp.send(sender);
-						}
-						// Signs
-						List<String> signLocations = new ArrayList<>();
-						for(Location location : buy.getSignsFeature().getSignLocations()) {
-							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
-						}
-						if(!signLocations.isEmpty()) {
-							plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
-						}
-						// Groups
-						if(sender.hasPermission("areashop.groupinfo") && !buy.getGroupNames().isEmpty()) {
-							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
-						}
-						// Restoring
-						if(buy.isRestoreEnabled()) {
-							plugin.messageNoPrefix(sender, "info-regionRestoringBuy", buy);
-						}
-						// Restrictions
-						if(!buy.isSold()) {
-							if(buy.restrictedToRegion()) {
-								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
-							} else if(buy.restrictedToWorld()) {
-								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
-							}
-						}
-						plugin.messageNoPrefix(sender, "info-regionFooterBuy", buy);
+					} else {
+						plugin.messageNoPrefix(sender, "info-regionCanBeRented", rent);
 					}
-				} else {
-					plugin.message(sender, "info-regionHelp");
+					if(rent.getLandlordName() != null) {
+						plugin.messageNoPrefix(sender, "info-regionLandlord", rent);
+					}
+					// Maximum extends
+					if(rent.getMaxExtends() != -1) {
+						if(rent.getMaxExtends() == 0) {
+							plugin.messageNoPrefix(sender, "info-regionNoExtending", rent);
+						} else if(rent.isRented()) {
+							plugin.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
+						} else {
+							plugin.messageNoPrefix(sender, "info-regionMaxExtends", rent);
+						}
+					}
+					// If maxExtends is zero it does not make sense to show this message
+					if(rent.getMaxRentTime() != -1 && rent.getMaxExtends() != 0) {
+						plugin.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
+					}
+					if(rent.getInactivityThresholdMillis() != -1) {
+						plugin.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
+					}
+					// Teleport
+					Message tp = Message.fromKey("info-prefix");
+					boolean foundSomething = false;
+					if(TeleportCommand.canUse(sender, rent)) {
+						foundSomething = true;
+						tp.append(Message.fromKey("info-regionTeleport").replacements(rent));
+					}
+					if(SetteleportCommand.canUse(sender, rent)) {
+						if(foundSomething) {
+							tp.append(", ");
+						}
+						foundSomething = true;
+						tp.append(Message.fromKey("info-setRegionTeleport").replacements(rent));
+					}
+					if(foundSomething) {
+						tp.append(".");
+						tp.send(sender);
+					}
+					// Signs
+					List<String> signLocations = new ArrayList<>();
+					for(Location location : rent.getSignsFeature().getSignLocations()) {
+						signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
+					}
+					if(!signLocations.isEmpty()) {
+						plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+					}
+					// Groups
+					if(sender.hasPermission("areashop.groupinfo") && !rent.getGroupNames().isEmpty()) {
+						plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
+					}
+					// Restoring
+					if(rent.isRestoreEnabled()) {
+						plugin.messageNoPrefix(sender, "info-regionRestoringRent", rent);
+					}
+					// Restrictions
+					if(!rent.isRented()) {
+						if(rent.restrictedToRegion()) {
+							plugin.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
+						} else if(rent.restrictedToWorld()) {
+							plugin.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
+						}
+					}
+					plugin.messageNoPrefix(sender, "info-regionFooterRent", rent);
+				} else if(buy != null) {
+					plugin.message(sender, "info-regionHeaderBuy", buy);
+					if(buy.isSold()) {
+						if(buy.isInResellingMode()) {
+							plugin.messageNoPrefix(sender, "info-regionReselling", buy);
+							plugin.messageNoPrefix(sender, "info-regionReselPrice", buy);
+						} else {
+							plugin.messageNoPrefix(sender, "info-regionBought", buy);
+						}
+						// Money back
+						if(!buy.getBooleanSetting("buy.sellDisabled")) {
+							if (SellCommand.canUse(sender, buy)) {
+								plugin.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
+							} else {
+								plugin.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
+							}
+						}
+						// Friends
+						if(!buy.getFriendsFeature().getFriendNames().isEmpty()) {
+							String messagePart = "info-friend";
+							if(DelfriendCommand.canUse(sender, buy)) {
+								messagePart = "info-friendRemove";
+							}
+							plugin.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
+						}
+					} else {
+						plugin.messageNoPrefix(sender, "info-regionCanBeBought", buy);
+					}
+					if(buy.getLandlord() != null) {
+						plugin.messageNoPrefix(sender, "info-regionLandlord", buy);
+					}
+					if(buy.getInactivityThresholdMillis() != -1) {
+						plugin.messageNoPrefix(sender, "info-regionInactiveSell", buy);
+					}
+					// Teleport
+					Message tp = Message.fromKey("info-prefix");
+					boolean foundSomething = false;
+					if(TeleportCommand.canUse(sender, buy)) {
+						foundSomething = true;
+						tp.append(Message.fromKey("info-regionTeleport").replacements(buy));
+					}
+					if(SetteleportCommand.canUse(sender, buy)) {
+						if(foundSomething) {
+							tp.append(", ");
+						}
+						foundSomething = true;
+						tp.append(Message.fromKey("info-setRegionTeleport").replacements(buy));
+					}
+					if(foundSomething) {
+						tp.append(".");
+						tp.send(sender);
+					}
+					// Signs
+					List<String> signLocations = new ArrayList<>();
+					for(Location location : buy.getSignsFeature().getSignLocations()) {
+						signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
+					}
+					if(!signLocations.isEmpty()) {
+						plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+					}
+					// Groups
+					if(sender.hasPermission("areashop.groupinfo") && !buy.getGroupNames().isEmpty()) {
+						plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
+					}
+					// Restoring
+					if(buy.isRestoreEnabled()) {
+						plugin.messageNoPrefix(sender, "info-regionRestoringBuy", buy);
+					}
+					// Restrictions
+					if(!buy.isSold()) {
+						if(buy.restrictedToRegion()) {
+							plugin.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
+						} else if(buy.restrictedToWorld()) {
+							plugin.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
+						}
+					}
+					plugin.messageNoPrefix(sender, "info-regionFooterBuy", buy);
 				}
 			} else {
 				plugin.message(sender, "info-help");

AreaShop/src/main/java/me/wiefferink/areashop/commands/LinksignsCommand.java

@@ -8,6 +8,7 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.StringJoiner;
 
 public class LinksignsCommand extends CommandAreaShop {
 
@@ -47,14 +48,11 @@ public class LinksignsCommand extends CommandAreaShop {
 				if(signProfilesSection != null) {
 					Set<String> profiles = signProfilesSection.getKeys(false);
 					if(!profiles.contains(profile)) {
-						ArrayList<String> message = new ArrayList<>();
+						StringJoiner joiner = new StringJoiner(", ");
 						for(String p : profiles) {
-							if(!message.isEmpty()) {
-								message.add(", ");
-							}
-							message.addAll(Message.fromKey("addsign-profile").replacements(p).get());
+							Message.fromKey("addsign-profile").replacements(p).get().forEach(joiner::add);
 						}
-						plugin.message(sender, "addsign-wrongProfile", Message.fromList(message));
+						plugin.message(sender, "addsign-wrongProfile", joiner.toString());
 						return;
 					}
 				}

AreaShop/src/main/java/me/wiefferink/areashop/commands/ResellCommand.java

@@ -85,7 +85,7 @@ public class ResellCommand extends CommandAreaShop {
 			buy.update();
 			plugin.message(sender, "resell-success", buy);
 		} else if(sender.hasPermission("areashop.resell") && sender instanceof Player) {
-			if(!buy.isOwner((Player)sender)) {
+			if(!buy.isTransactionHolder((Player)sender)) {
 				plugin.message(sender, "resell-noPermissionOther", buy);
 				return;
 			}

AreaShop/src/main/java/me/wiefferink/areashop/commands/SellCommand.java

@@ -2,6 +2,7 @@ package me.wiefferink.areashop.commands;
 
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -11,86 +12,87 @@ import java.util.List;
 
 public class SellCommand extends CommandAreaShop {
 
-	@Override
-	public String getCommandStart() {
-		return "areashop sell";
-	}
+    /**
+     * Check if a person can sell the region.
+     *
+     * @param person The person to check
+     * @param region The region to check for
+     * @return true if the person can sell it, otherwise false
+     */
+    public static boolean canUse(CommandSender person, GeneralRegion region) {
+        if (person.hasPermission("areashop.sell")) {
+            return true;
+        }
+        if (person instanceof Player && region instanceof TransactionalRegion) {
+            Player player = (Player) person;
+            return ((TransactionalRegion) region).isTransactionHolder(player) && person.hasPermission("areashop.sellown");
+        }
+        return false;
+    }
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.sell") || target.hasPermission("areashop.sellown")) {
-			return "help-sell";
-		}
-		return null;
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop sell";
+    }
 
-	/**
-	 * Check if a person can sell the region.
-	 * @param person The person to check
-	 * @param region The region to check for
-	 * @return true if the person can sell it, otherwise false
-	 */
-	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(person.hasPermission("areashop.sell")) {
-			return true;
-		}
-		if(person instanceof Player) {
-			Player player = (Player)person;
-			return region.isOwner(player) && person.hasPermission("areashop.sellown");
-		}
-		return false;
-	}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.sell") || target.hasPermission("areashop.sellown")) {
+            return "help-sell";
+        }
+        return null;
+    }
 
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.sell") && !sender.hasPermission("areashop.sellown")) {
-			plugin.message(sender, "sell-noPermission");
-			return;
-		}
-		BuyRegion buy;
-		if(args.length <= 1) {
-			if(sender instanceof Player) {
-				// get the region by location
-				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
-				if(regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					buy = regions.get(0);
-				}
-			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}
-		} else {
-			buy = plugin.getFileManager().getBuy(args[1]);
-		}
-		if(buy == null) {
-			plugin.message(sender, "sell-notRegistered");
-			return;
-		}
-		if(!buy.isSold()) {
-			plugin.message(sender, "sell-notBought", buy);
-			return;
-		}
-		buy.sell(true, sender);
-	}
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.sell") && !sender.hasPermission("areashop.sellown")) {
+            plugin.message(sender, "sell-noPermission");
+            return;
+        }
+        BuyRegion buy;
+        if (args.length <= 1) {
+            if (sender instanceof Player) {
+                // get the region by location
+                List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player) sender).getLocation());
+                if (regions.isEmpty()) {
+                    plugin.message(sender, "cmd-noRegionsAtLocation");
+                    return;
+                } else if (regions.size() > 1) {
+                    plugin.message(sender, "cmd-moreRegionsAtLocation");
+                    return;
+                } else {
+                    buy = regions.get(0);
+                }
+            } else {
+                plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+                return;
+            }
+        } else {
+            buy = plugin.getFileManager().getBuy(args[1]);
+        }
+        if (buy == null) {
+            plugin.message(sender, "sell-notRegistered");
+            return;
+        }
+        if (!buy.isSold()) {
+            plugin.message(sender, "sell-notBought", buy);
+            return;
+        }
+        buy.sell(true, sender);
+    }
 
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(BuyRegion region : plugin.getFileManager().getBuys()) {
-				if(region.isSold()) {
-					result.add(region.getName());
-				}
-			}
-		}
-		return result;
-	}
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        ArrayList<String> result = new ArrayList<>();
+        if (toComplete == 2) {
+            for (BuyRegion region : plugin.getFileManager().getBuys()) {
+                if (region.isSold()) {
+                    result.add(region.getName());
+                }
+            }
+        }
+        return result;
+    }
 }
 
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetownerCommand.java

@@ -3,6 +3,7 @@ package me.wiefferink.areashop.commands;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -77,7 +78,7 @@ public class SetownerCommand extends CommandAreaShop {
 		UUID uuid = null;
 		@SuppressWarnings("deprecation")
 		OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
-		if(player != null) {
+		if(player.hasPlayedBefore()) {
 			uuid = player.getUniqueId();
 		}
 		if(uuid == null) {
@@ -87,26 +88,27 @@ public class SetownerCommand extends CommandAreaShop {
 
 		if(region instanceof RentRegion) {
 			RentRegion rent = (RentRegion)region;
-			if(rent.isRenter(uuid)) {
+			if(rent.isTransactionHolder(uuid)) {
 				// extend
 				rent.setRentedUntil(rent.getRentedUntil() + rent.getDuration());
-				rent.setRenter(uuid);
 				plugin.message(sender, "setowner-succesRentExtend", region);
 			} else {
 				// change
 				if(!rent.isRented()) {
-					rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
+					rent.setRentedUntil(System.currentTimeMillis()  + rent.getDuration());
 				}
-				rent.setRenter(uuid);
 				plugin.message(sender, "setowner-succesRent", region);
 			}
+			rent.setTransactionHolder(uuid);
 		}
 		if(region instanceof BuyRegion) {
 			BuyRegion buy = (BuyRegion)region;
-			buy.setBuyer(uuid);
+			buy.setTransactionHolder(uuid);
 			plugin.message(sender, "setowner-succesBuy", region);
 		}
-		region.getFriendsFeature().deleteFriend(region.getOwner(), null);
+		if (region instanceof TransactionalRegion) {
+			region.getFriendsFeature().deleteFriend(((TransactionalRegion) region).getTransactionHolder(), null);
+		}
 		region.update();
 		region.saveRequired();
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetpriceCommand.java

@@ -66,9 +66,9 @@ public class SetpriceCommand extends CommandAreaShop {
 		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
 			if(region instanceof RentRegion) {
-				((RentRegion)region).setPrice(null);
+				((RentRegion)region).setPrice(0);
 			} else if(region instanceof BuyRegion) {
-				((BuyRegion)region).setPrice(null);
+				((BuyRegion)region).setPrice(0);
 			}
 			region.update();
 			plugin.message(sender, "setprice-successRemoved", region);

AreaShop/src/main/java/me/wiefferink/areashop/commands/TestCommand.java

@@ -0,0 +1,31 @@
+package me.wiefferink.areashop.commands;
+
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.AreaShop;
+import org.bukkit.Location;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class TestCommand implements CommandExecutor {
+
+    private AreaShop areaShop = AreaShop.getInstance();
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (sender instanceof Player) {
+            final Player player = (Player) sender;
+            final Location location = player.getLocation();
+            ApplicableRegionSet region = areaShop.getRegionManager(player.getWorld()).getApplicableRegions(BlockVector3.at(location.getX(), location.getY(), location.getZ()));
+            for (ProtectedRegion r : region.getRegions()) {
+                player.sendMessage(r.getId());
+            }
+        }
+        return true;
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/commands/UnrentCommand.java

@@ -2,6 +2,7 @@ package me.wiefferink.areashop.commands;
 
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -11,86 +12,87 @@ import java.util.List;
 
 public class UnrentCommand extends CommandAreaShop {
 
-	@Override
-	public String getCommandStart() {
-		return "areashop unrent";
-	}
+    /**
+     * Check if a person can unrent the region.
+     *
+     * @param person The person to check
+     * @param region The region to check for
+     * @return true if the person can unrent it, otherwise false
+     */
+    public static boolean canUse(CommandSender person, GeneralRegion region) {
+        if (person.hasPermission("areashop.unrent")) {
+            return true;
+        }
+        if (person instanceof Player && region instanceof TransactionalRegion) {
+            Player player = (Player) person;
+            return ((TransactionalRegion) region).isTransactionHolder(player) && person.hasPermission("areashop.unrentown");
+        }
+        return false;
+    }
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.unrent") || target.hasPermission("areashop.unrentown")) {
-			return "help-unrent";
-		}
-		return null;
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop unrent";
+    }
 
-	/**
-	 * Check if a person can unrent the region.
-	 * @param person The person to check
-	 * @param region The region to check for
-	 * @return true if the person can unrent it, otherwise false
-	 */
-	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(person.hasPermission("areashop.unrent")) {
-			return true;
-		}
-		if(person instanceof Player) {
-			Player player = (Player)person;
-			return region.isOwner(player) && person.hasPermission("areashop.unrentown");
-		}
-		return false;
-	}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.unrent") || target.hasPermission("areashop.unrentown")) {
+            return "help-unrent";
+        }
+        return null;
+    }
 
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.unrent") && !sender.hasPermission("areashop.unrentown")) {
-			plugin.message(sender, "unrent-noPermission");
-			return;
-		}
-		RentRegion rent;
-		if(args.length <= 1) {
-			if(sender instanceof Player) {
-				// get the region by location
-				List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
-				if(regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					rent = regions.get(0);
-				}
-			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}
-		} else {
-			rent = plugin.getFileManager().getRent(args[1]);
-		}
-		if(rent == null) {
-			plugin.message(sender, "unrent-notRegistered");
-			return;
-		}
-		if(!rent.isRented()) {
-			plugin.message(sender, "unrent-notRented", rent);
-			return;
-		}
-		rent.unRent(true, sender);
-	}
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.unrent") && !sender.hasPermission("areashop.unrentown")) {
+            plugin.message(sender, "unrent-noPermission");
+            return;
+        }
+        RentRegion rent;
+        if (args.length <= 1) {
+            if (sender instanceof Player) {
+                // get the region by location
+                List<RentRegion> regions = Utils.getImportantRentRegions(((Player) sender).getLocation());
+                if (regions.isEmpty()) {
+                    plugin.message(sender, "cmd-noRegionsAtLocation");
+                    return;
+                } else if (regions.size() > 1) {
+                    plugin.message(sender, "cmd-moreRegionsAtLocation");
+                    return;
+                } else {
+                    rent = regions.get(0);
+                }
+            } else {
+                plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+                return;
+            }
+        } else {
+            rent = plugin.getFileManager().getRent(args[1]);
+        }
+        if (rent == null) {
+            plugin.message(sender, "unrent-notRegistered");
+            return;
+        }
+        if (!rent.isRented()) {
+            plugin.message(sender, "unrent-notRented", rent);
+            return;
+        }
+        rent.unRent(true, sender);
+    }
 
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(RentRegion region : plugin.getFileManager().getRents()) {
-				if(region.isRented()) {
-					result.add(region.getName());
-				}
-			}
-		}
-		return result;
-	}
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        ArrayList<String> result = new ArrayList<>();
+        if (toComplete == 2) {
+            for (RentRegion region : plugin.getFileManager().getRents()) {
+                if (region.isRented()) {
+                    result.add(region.getName());
+                }
+            }
+        }
+        return result;
+    }
 }
 
 

AreaShop/src/main/java/me/wiefferink/areashop/features/FriendsFeature.java

@@ -56,13 +56,12 @@ public class FriendsFeature extends RegionFeature {
 			return false;
 		}
 
-		Set<String> friends = new HashSet<>(getRegion().getConfig().getStringList("general.friends"));
+		List<String> friends = getRegion().getConfig().getStringList("general.friends");
 		friends.remove(player.toString());
-		List<String> list = new ArrayList<>(friends);
-		if(list.isEmpty()) {
+		if(friends.isEmpty()) {
 			getRegion().setSetting("general.friends", null);
 		} else {
-			getRegion().setSetting("general.friends", list);
+			getRegion().setSetting("general.friends", friends);
 		}
 		return true;
 	}
@@ -92,7 +91,7 @@ public class FriendsFeature extends RegionFeature {
 		HashSet<String> result = new HashSet<>();
 		for(UUID friend : getFriends()) {
 			OfflinePlayer player = Bukkit.getOfflinePlayer(friend);
-			if(player.hasPlayedBefore() && player.getName() != null) {
+			if(player != null && player.getName() != null) {
 				result.add(player.getName());
 			}
 		}

AreaShop/src/main/java/me/wiefferink/areashop/features/TeleportFeature.java

@@ -1,20 +1,22 @@
 package me.wiefferink.areashop.features;
 
-import co.aikar.taskchain.TaskChain;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import io.papermc.lib.PaperLib;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.handlers.worldguard.v7.WorldGuardHandler;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.areashop.tools.Value;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.BlockState;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
@@ -41,18 +43,18 @@ public class TeleportFeature extends RegionFeature {
      */
     private static boolean isSafe(Location location) {
         Block feet = location.getBlock();
-        BlockState head = PaperLib.getBlockState(feet.getRelative(BlockFace.UP), true).getState();
-        BlockState below =  PaperLib.getBlockState(feet.getRelative(BlockFace.DOWN), true).getState();
-        BlockState above =  PaperLib.getBlockState(head.getBlock().getRelative(BlockFace.UP), true).getState();
+        Block head = feet.getRelative(BlockFace.UP);
+        Block below = feet.getRelative(BlockFace.DOWN);
+        Block above = head.getRelative(BlockFace.UP);
 
         // Check the block at the feet and head of the player
         if ((feet.getType().isSolid() && !canSpawnIn(feet.getType())) || feet.isLiquid()) {
             return false;
-        } else if ((head.getType().isSolid() && !canSpawnIn(head.getType())) || head.getBlock().isLiquid()) {
+        } else if ((head.getType().isSolid() && !canSpawnIn(head.getType())) || head.isLiquid()) {
             return false;
-        } else if (!below.getType().isSolid() || cannotSpawnOn(below.getType()) || below.getBlock().isLiquid()) {
+        } else if (!below.getType().isSolid() || cannotSpawnOn(below.getType()) || below.isLiquid()) {
             return false;
-        } else if (above.getBlock().isLiquid() || cannotSpawnBeside(above.getType())) {
+        } else if (above.isLiquid() || cannotSpawnBeside(above.getType())) {
             return false;
         }
 
@@ -66,7 +68,7 @@ public class TeleportFeature extends RegionFeature {
                         continue;
                     }
 
-                    around.add(PaperLib.getBlockState(below.getBlock().getRelative(x, y, z), true).getState().getType());
+                    around.add(below.getRelative(x, y, z).getType());
                 }
             }
         }
@@ -251,20 +253,14 @@ public class TeleportFeature extends RegionFeature {
         BlockVector3 min = worldguardRegion.getMinimumPoint();
         BlockVector3 max = worldguardRegion.getMaximumPoint();
 
-        final Collection<int[]> collection = new HashSet<>();
         for (int x = min.getX(); x < max.getX(); x += 16) {
             for (int z = min.getZ(); z < max.getZ(); z += 16) {
-                collection.add(new int[]{x, z});
+                PaperLib.getChunkAtAsync(world, x >> 4, z >> 4);
             }
         }
-
-        final CompletableFuture<Boolean> future = new CompletableFuture<>();
+        CompletableFuture<Boolean> future = new CompletableFuture<>();
         final boolean finalToSign = toSign;
-        TaskChain<?> chain = Utils.newChain();
-        if (collection.size() < 64) {
-            chain = chain.future(Utils.runAsBatches(collection, 16, (arr) -> PaperLib.getChunkAtAsync(world, arr[0], arr[1]), false));
-        }
-        chain.delay(3).syncLast((unused) -> {
+        Bukkit.getScheduler().runTaskLater(plugin, () -> {
             boolean blocksInRegionCopy = blocksInRegion;
             Location safeLocation = startLocation;
             // Tries limit tracking
@@ -475,13 +471,16 @@ public class TeleportFeature extends RegionFeature {
             }
 
             if (done && isSafe(safeLocation)) {
+                final SignsFeature feature = getRegion().getSignsFeature();
+                Collection<RegionSign> signs = feature.getSigns();
                 if (finalToSign) {
                     getRegion().message(player, "teleport-successSign");
 
                     // Let the player look at the sign
                     Vector playerVector = safeLocation.toVector();
                     playerVector.setY(playerVector.getY() + player.getEyeHeight(true));
-                    Vector signVector = getRegion().getSignsFeature().getSigns().get(0).getLocation().toVector().add(new Vector(0.5, 0.5, 0.5));
+                    final RegionSign first = signs.iterator().next();
+                    Vector signVector = first.getLocation().add(0.5, 0.5, 0.5).toVector();
                     Vector direction = playerVector.clone().subtract(signVector).normalize();
                     safeLocation.setYaw(180 - (float) Math.toDegrees(Math.atan2(direction.getX(), direction.getZ())));
                     safeLocation.setPitch(90 - (float) Math.toDegrees(Math.acos(direction.getY())));
@@ -496,7 +495,7 @@ public class TeleportFeature extends RegionFeature {
                 AreaShop.debug("No location found, checked " + checked + " spots of max " + maxTries);
                 future.complete(false);
             }
-        }).execute();
+        }, 1);
         return future;
     }
 
@@ -533,19 +532,20 @@ public class TeleportFeature extends RegionFeature {
         ProtectedRegion worldguardRegion = getRegion().getRegion();
 
         // Try to get sign location
-        List<RegionSign> signs = getRegion().getSignsFeature().getSigns();
+        Collection<RegionSign> signs = getRegion().getSignsFeature().getSigns();
         boolean signAvailable = !signs.isEmpty();
         if (toSign.get()) {
+            RegionSign sign = signs.iterator().next();
             if (signAvailable) {
                 // Use the location 1 below the sign to prevent weird spawing above the sign
-                startLocation = signs.get(0).getLocation(); //.subtract(0.0, 1.0, 0.0);
+                startLocation = sign.getLocation(); //.subtract(0.0, 1.0, 0.0);
                 startLocation.setPitch(player.getLocation().getPitch());
                 startLocation.setYaw(player.getLocation().getYaw());
 
                 // Move player x blocks away from the sign
                 double distance = getRegion().getDoubleSetting("general.teleportSignDistance");
                 if (distance > 0) {
-                    BlockFace facing = getRegion().getSignsFeature().getSigns().get(0).getFacing();
+                    BlockFace facing = sign.getFacing();
                     Vector facingVector = new Vector(facing.getModX(), facing.getModY(), facing.getModZ())
                             .normalize()
                             .multiply(distance);
@@ -567,9 +567,10 @@ public class TeleportFeature extends RegionFeature {
 
         // Calculate a default location
         if (startLocation == null) {
+            final WorldGuardInterface handler = AreaShop.getInstance().getWorldGuardHandler();
             // Set to block in the middle, y configured in the config
-            Vector regionMin = AreaShop.getInstance().getWorldGuardHandler().getMinimumPoint(worldguardRegion);
-            Vector regionMax = AreaShop.getInstance().getWorldGuardHandler().getMaximumPoint(worldguardRegion);
+            Vector regionMin =  handler.getMinimumPoint(worldguardRegion);
+            Vector regionMax = handler.getMaximumPoint(worldguardRegion);
             Vector middle = regionMin.clone().midpoint(regionMax);
             String configSetting = getRegion().getStringSetting("general.teleportLocationY");
             if ("bottom".equalsIgnoreCase(configSetting)) {
@@ -586,7 +587,8 @@ public class TeleportFeature extends RegionFeature {
                     AreaShop.warn("Could not parse general.teleportLocationY: '" + configSetting + "'");
                 }
             }
-            startLocation = new Location(getRegion().getWorld(), middle.getX(), middle.getY(), middle.getZ(), player.getLocation().getYaw(), player.getLocation().getPitch());
+            final Location location = player.getLocation();
+            startLocation = new Location(getRegion().getWorld(), middle.getX(), middle.getY(), middle.getZ(), location.getYaw(), location.getPitch());
         }
 
         // Set location in the center of the block

AreaShop/src/main/java/me/wiefferink/areashop/features/WorldGuardRegionFlagsFeature.java

@@ -255,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");

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/RegionSign.java

@@ -1,8 +1,6 @@
 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.regions.GeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
@@ -13,7 +11,6 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 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;
@@ -144,7 +141,7 @@ public class RegionSign {
         }
 
         ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
-        assert stateConfig != null;
+
         // Get the lines
         String[] signLines = new String[4];
         boolean signEmpty = true;
@@ -156,22 +153,21 @@ public class RegionSign {
             block.setType(Material.AIR);
             return true;
         }
-        final BlockStateSnapshotResult snapshotResult = PaperLib.getBlockState(block, true);
-        final BlockState blockState = snapshotResult.getState();
+
         // Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
         if (!Materials.isSign(block.getType())) {
             Material signType = getMaterial();
             if (signType.name().contains("SIGN")) {
-                final BlockData data = blockState.getBlockData();
                 // Don't do physics here, we first need to update the direction
-                blockState.setType(signType);
+                block.setType(signType, false);
+                BlockData data = block.getBlockData();
                 if (data instanceof WallSign) {
                     ((WallSign) data).setFacing(getFacing());
                 } else if (data instanceof Sign) {
                     ((org.bukkit.block.data.type.Sign) data).setRotation(getFacing());
                 }
-                blockState.setBlockData(data);
-                blockState.update(false, false);
+                block.setBlockData(data, true);
+
                 // Check if the sign has popped
                 if (!Materials.isSign(block.getType())) {
                     AreaShop.warn("Setting sign", key, "of region", getRegion().getName(), "failed, could not set sign block back");
@@ -189,7 +185,7 @@ public class RegionSign {
         if (!regionConfig.isString("general.signs." + key + ".facing")) {
             final BlockFace rotation;
             if (Materials.isSign(block.getType())) {
-                BlockData data = blockState.getBlockData();
+                BlockData data = block.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) {
@@ -204,7 +200,7 @@ public class RegionSign {
         }
 
         // Apply replacements and color and then set it on the sign
-        Sign signState = (Sign) blockState;
+        Sign signState = (Sign) block.getState();
         for (int i = 0; i < signLines.length; i++) {
             if (signLines[i] == null) {
                 signState.setLine(i, "");
@@ -214,7 +210,8 @@ public class RegionSign {
             signLines[i] = Utils.applyColors(signLines[i]);
             signState.setLine(i, signLines[i]);
         }
-        return signState.update(false, false);
+        signState.update();
+        return true;
     }
 
     /**

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/SignsFeature.java

@@ -22,7 +22,6 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Sign;
 import org.bukkit.block.data.type.WallSign;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -34,11 +33,12 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class SignsFeature extends RegionFeature {
 
-    private static final Map<String, RegionSign> allSigns = Collections.synchronizedMap(new HashMap<>());
-    private static final Map<String, List<RegionSign>> signsByChunk = Collections.synchronizedMap(new HashMap<>());
+    private static final Map<String, RegionSign> allSigns = new ConcurrentHashMap<>();
+    private static final Map<String, List<RegionSign>> signsByChunk = new ConcurrentHashMap<>();
 
     private Map<String, RegionSign> signs;
 
@@ -579,8 +579,8 @@ public class SignsFeature extends RegionFeature {
      *
      * @return List of signs
      */
-    public List<RegionSign> getSigns() {
-        return new ArrayList<>(signs.values());
+    public Collection<RegionSign> getSigns() {
+        return new HashSet<>(signs.values());
     }
 
     /**
@@ -598,7 +598,7 @@ public class SignsFeature extends RegionFeature {
      * @return A List with all sign locations
      */
     public List<Location> getSignLocations() {
-        List<Location> result = new ArrayList<>(signs.size());
+        List<Location> result = new ArrayList<>();
         for (RegionSign sign : signs.values()) {
             result.add(sign.getLocation());
         }
@@ -615,8 +615,7 @@ public class SignsFeature extends RegionFeature {
      */
     public void addSign(Location location, Material signType, BlockFace facing, String profile) {
         int i = 0;
-        final YamlConfiguration configuration = getRegion().getConfig();
-        while (configuration.isSet("general.signs." + i)) {
+        while (getRegion().getConfig().isSet("general.signs." + i)) {
             i++;
         }
         String signPath = "general.signs." + i + ".";

AreaShop/src/main/java/me/wiefferink/areashop/listeners/PlayerLoginLogoutListener.java

@@ -4,6 +4,7 @@ import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -15,6 +16,7 @@ import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -54,8 +56,12 @@ public final class PlayerLoginLogoutListener implements Listener {
                 return false;
             }
             // Notify for rents that almost run out
-            for (RentRegion region : plugin.getFileManager().getRents()) {
-                if (region.isRenter(player)) {
+            for (GeneralRegion generalRegion : plugin.getFileManager().getRegions()) {
+                if (!(generalRegion instanceof RentRegion)) {
+                    continue;
+                }
+                final RentRegion region = (RentRegion) generalRegion;
+                if (region.isTransactionHolder(player)) {
                     String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
                     if (warningSetting == null || warningSetting.isEmpty()) {
                         continue;
@@ -79,9 +85,9 @@ public final class PlayerLoginLogoutListener implements Listener {
                 return true;
             }
 
-            List<GeneralRegion> regions = new ArrayList<>();
+            List<GeneralRegion> regions = new LinkedList<>();
             for (GeneralRegion region : plugin.getFileManager().getRegions()) {
-                if (region.isOwner(player)) {
+                if (region instanceof TransactionalRegion && ((TransactionalRegion) region).isTransactionHolder(player)) {
                     regions.add(region);
                 }
             }
@@ -119,7 +125,7 @@ public final class PlayerLoginLogoutListener implements Listener {
      */
     private void updateLastActive(Player player) {
         for (GeneralRegion region : plugin.getFileManager().getRegions()) {
-            if (region.isOwner(player)) {
+            if (region instanceof TransactionalRegion && ((TransactionalRegion) region).isTransactionHolder(player)) {
                 region.updateLastActiveTime();
             }
         }

AreaShop/src/main/java/me/wiefferink/areashop/managers/FileManager.java

@@ -1,8 +1,10 @@
 package me.wiefferink.areashop.managers;
 
+import co.aikar.taskchain.TaskChain;
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.managers.storage.StorageException;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.events.ask.AddingRegionEvent;
@@ -22,40 +24,37 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 public class FileManager extends Manager {
 
     private final Set<String> worldRegionsRequireSaving;
-
-    private final Map<String, BuyRegion> buyRegions = new HashMap<>();
-    private final Map<String, RentRegion> rentRegions = new HashMap<>();
-    private final Map<String, GeneralRegion> allRegions = new HashMap<>();
-    private final String regionsPath;
-    private final HashMap<String, RegionGroup> groups;
-    private final String configPath;
+    private HashMap<String, GeneralRegion> regions = null;
+    private String regionsPath = null;
+    private HashMap<String, RegionGroup> groups = null;
+    private String configPath = null;
     private YamlConfiguration config = null;
-    private final String groupsPath;
+    private String groupsPath = null;
     private YamlConfiguration groupsConfig = null;
-    private final String defaultPath;
+    private String defaultPath = null;
     private YamlConfiguration defaultConfig = null;
     private YamlConfiguration defaultConfigFallback = null;
     private boolean saveGroupsRequired = false;
     private HashMap<String, Integer> versions = null;
-    private final String versionPath;
-    private final String schemFolder;
+    private String versionPath = null;
+    private String schemFolder = null;
 
     /**
      * Constructor, initialize variabeles.
      */
     public FileManager() {
+        regions = new HashMap<>();
         regionsPath = plugin.getDataFolder() + File.separator + AreaShop.regionsFolder;
         configPath = plugin.getDataFolder() + File.separator + "config.yml";
         groups = new HashMap<>();
@@ -151,7 +150,7 @@ public class FileManager extends Manager {
      * @return The region if found, otherwise null
      */
     public GeneralRegion getRegion(String name) {
-        return allRegions.get(name.toLowerCase());
+        return regions.get(name.toLowerCase());
     }
 
     /**
@@ -161,7 +160,11 @@ public class FileManager extends Manager {
      * @return RentRegion if it could be found, otherwise null
      */
     public RentRegion getRent(String name) {
-        return rentRegions.get(name.toLowerCase());
+        GeneralRegion region = regions.get(name.toLowerCase());
+        if (region instanceof RentRegion) {
+            return (RentRegion) region;
+        }
+        return null;
     }
 
     /**
@@ -171,7 +174,11 @@ public class FileManager extends Manager {
      * @return BuyRegion if it could be found, otherwise null
      */
     public BuyRegion getBuy(String name) {
-        return buyRegions.get(name.toLowerCase());
+        GeneralRegion region = regions.get(name.toLowerCase());
+        if (region instanceof BuyRegion) {
+            return (BuyRegion) region;
+        }
+        return null;
     }
 
     /**
@@ -180,7 +187,13 @@ public class FileManager extends Manager {
      * @return List of all rental regions
      */
     public List<RentRegion> getRents() {
-        return new ArrayList<>(rentRegions.values());
+        List<RentRegion> result = new LinkedList<>();
+        for (GeneralRegion region : regions.values()) {
+            if (region instanceof RentRegion) {
+                result.add((RentRegion) region);
+            }
+        }
+        return result;
     }
 
     /**
@@ -189,7 +202,13 @@ public class FileManager extends Manager {
      * @return List of all buy regions
      */
     public List<BuyRegion> getBuys() {
-        return new ArrayList<>(buyRegions.values());
+        List<BuyRegion> result = new LinkedList<>();
+        for (GeneralRegion region : regions.values()) {
+            if (region instanceof BuyRegion) {
+                result.add((BuyRegion) region);
+            }
+        }
+        return result;
     }
 
     /**
@@ -198,9 +217,7 @@ public class FileManager extends Manager {
      * @return List of all regions (it is safe to modify the list)
      */
     public List<GeneralRegion> getRegions() {
-        final List<GeneralRegion> list = new ArrayList<>(allRegions.size());
-        list.addAll(allRegions.values());
-        return list;
+        return new ArrayList<>(regions.values());
     }
 
     /**
@@ -209,11 +226,7 @@ public class FileManager extends Manager {
      * @return A String list with all the names
      */
     public List<String> getBuyNames() {
-        final List<String> list = new ArrayList<>(buyRegions.size());
-        for (GeneralRegion region : buyRegions.values()) {
-            list.add(region.getName());
-        }
-        return list;
+        return getBuys().stream().map(GeneralRegion::getName).collect(Collectors.toList());
     }
 
     /**
@@ -222,11 +235,7 @@ public class FileManager extends Manager {
      * @return A String list with all the names
      */
     public List<String> getRentNames() {
-        final List<String> list = new ArrayList<>(rentRegions.size());
-        for (GeneralRegion region : rentRegions.values()) {
-            list.add(region.getName());
-        }
-        return list;
+        return getRents().stream().map(GeneralRegion::getName).collect(Collectors.toList());
     }
 
     /**
@@ -235,11 +244,7 @@ public class FileManager extends Manager {
      * @return A String list with all the names
      */
     public List<String> getRegionNames() {
-        final List<String> list = new ArrayList<>(allRegions.size());
-        for (GeneralRegion region : rentRegions.values()) {
-            list.add(region.getName());
-        }
-        return list;
+        return getRegions().stream().map(GeneralRegion::getName).collect(Collectors.toList());
     }
 
     /**
@@ -248,11 +253,7 @@ public class FileManager extends Manager {
      * @return A String list with all the names
      */
     public List<String> getGroupNames() {
-        final List<String> names = new ArrayList<>(groups.size());
-        for (RegionGroup group : groups.values()) {
-            names.add(group.getName());
-        }
-        return names;
+      return getGroups().stream().map(RegionGroup::getName).collect(Collectors.toList());
     }
 
     /**
@@ -288,16 +289,7 @@ public class FileManager extends Manager {
         if (event.isCancelled()) {
             return event;
         }
-        final String name = region.getName().toLowerCase();
-        // Forcefully remove regions from cache.
-        buyRegions.remove(name);
-        rentRegions.remove(name);
-        if (region instanceof BuyRegion) {
-            buyRegions.put(region.getName().toLowerCase(), (BuyRegion) region);
-        } else if (region instanceof RentRegion) {
-            rentRegions.put(region.getName().toLowerCase(), (RentRegion) region);
-        }
-        allRegions.put(region.getName().toLowerCase(), region);
+        regions.put(region.getName().toLowerCase(), region);
         Bukkit.getPluginManager().callEvent(new AddedRegionEvent(region));
         return event;
     }
@@ -411,9 +403,8 @@ public class FileManager extends Manager {
         }
 
         region.resetRegionFlags();
-        rentRegions.remove(region.getLowerCaseName());
-        buyRegions.remove(region.getLowerCaseName());
-        allRegions.remove(region.getLowerCaseName());
+        regions.remove(region.getLowerCaseName());
+
         // Remove file
         File file = new File(plugin.getDataFolder() + File.separator + AreaShop.regionsFolder + File.separator + region.getLowerCaseName() + ".yml");
         if (file.exists()) {
@@ -560,24 +551,24 @@ public class FileManager extends Manager {
         }
         this.saveWorldGuardRegions();
 
-        final AtomicInteger processed = new AtomicInteger();
-        for (GeneralRegion region : allRegions.values()) {
+        TaskChain<?> chain = Utils.newChain();
+        int num = 0;
+        for (GeneralRegion region : getRegions()) {
             if (region.isSaveRequired()) {
-                region.saveNowAsync().thenAccept((unused) -> processed.getAndIncrement());
+                chain = region.saveNowAsync(chain);
+                num++;
             }
         }
-        final int finalCount = allRegions.size();
+        int processed = num;
         final CompletableFuture<Boolean> future = new CompletableFuture<>();
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                if (processed.get() != finalCount) {
-                    return;
-                }
-                this.cancel();
+        chain.execute((result) -> {
+            if (result) {
                 AreaShop.debug("Region save complete! Processed " + processed + " regions.");
+            } else {
+                AreaShop.warn("Failed to save region data!");
             }
-        }.runTaskTimer(plugin, 1, 1);
+            future.complete(result);
+        });
         return future;
     }
 
@@ -588,7 +579,7 @@ public class FileManager extends Manager {
         if (isSaveGroupsRequired()) {
             saveGroupsNow();
         }
-        for (GeneralRegion region : allRegions.values()) {
+        for (GeneralRegion region : getRegions()) {
             if (region.isSaveRequired()) {
                 region.saveNow();
             }
@@ -615,12 +606,9 @@ public class FileManager extends Manager {
                 RegionManager manager = plugin.getRegionManager(bukkitWorld);
                 if (manager != null) {
                     try {
-                        if (plugin.getWorldGuard().getDescription().getVersion().startsWith("5.")) {
-                            manager.save();
-                        } else {
-                            manager.saveChanges();
-                        }
-                    } catch (Exception e) {
+                        manager.saveChanges();
+                    } catch (StorageException e) {
+                        e.printStackTrace();
                         AreaShop.warn("WorldGuard regions in world " + world + " could not be saved");
                     }
                 }
@@ -670,7 +658,26 @@ public class FileManager extends Manager {
         if (checksPerTick < 1) {
             checksPerTick = Math.min(getRegions().size() / 10, 10);
         }
-        Utils.runAsBatches(getRegions(), checksPerTick, GeneralRegion::checkInactive, false);
+        // Run x amount of checks per tick. Will query for offline player async.
+        Utils.runAsBatches(getRegions(), checksPerTick, (region) -> {
+            CompletableFuture<OfflinePlayer> future = new CompletableFuture<>();
+            final String name = region.getLandlordName();
+            if (name == null) {
+                future.complete(null);
+                return;
+            }
+            if (Bukkit.getPlayer(name) != null) {
+                future.complete(Bukkit.getPlayer(name));
+            } else {
+                Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> future.complete(Bukkit.getOfflinePlayer(name)));
+            }
+            future.thenAccept(player -> Bukkit.getScheduler().callSyncMethod(plugin, () -> {
+                if (player != null) {
+                    return region.checkInactivity(player);
+                }
+                return null;
+            } ));
+        }, false);
     }
 
     /**
@@ -841,6 +848,7 @@ public class FileManager extends Manager {
      * @return true if succeeded, otherwise false
      */
     public boolean loadGroupsFile() {
+        boolean result = true;
         File groupFile = new File(groupsPath);
         if (groupFile.exists() && groupFile.isFile()) {
             try (
@@ -858,16 +866,14 @@ public class FileManager extends Manager {
             RegionGroup group = new RegionGroup(plugin, groupName);
             groups.put(groupName, group);
         }
-        return true;
+        return result;
     }
 
     /**
      * Load all region files.
      */
     public void loadRegionFiles() {
-        rentRegions.clear();
-        buyRegions.clear();
-        allRegions.clear();
+        regions.clear();
         final File file = new File(regionsPath);
         if (!file.exists()) {
             if (!file.mkdirs()) {
@@ -883,7 +889,7 @@ public class FileManager extends Manager {
     private void loadRegionFilesNow() {
         File file = new File(regionsPath);
         File[] regionFiles = file.listFiles();
-        if (regionFiles == null) {
+        if (regionFiles == null || regionFiles.length == 0) {
             plugin.setReady(true);
             return;
         }
@@ -962,7 +968,7 @@ public class FileManager extends Manager {
 
         boolean noWorldRegions = !noWorld.isEmpty();
         while (!noWorld.isEmpty()) {
-            List<GeneralRegion> toDisplay = new ArrayList<>(noWorld.size());
+            List<GeneralRegion> toDisplay = new ArrayList<>();
             String missingWorld = noWorld.get(0).getWorldName();
             toDisplay.add(noWorld.get(0));
             for (int i = 1; i < noWorld.size(); i++) {
@@ -982,7 +988,7 @@ public class FileManager extends Manager {
         }
 
         if (!incorrectDuration.isEmpty()) {
-            List<String> incorrectDurationNames = new ArrayList<>(incorrectDuration.size());
+            List<String> incorrectDurationNames = new ArrayList<>();
             for (GeneralRegion region : incorrectDuration) {
                 incorrectDurationNames.add(region.getName());
             }
@@ -1290,7 +1296,7 @@ public class FileManager extends Manager {
 
         // Add 'general.lastActive' to rented/bought regions (initialize at current time)
         if (fileStatus == null || fileStatus < 3) {
-            for (GeneralRegion region : allRegions.values()) {
+            for (GeneralRegion region : getRegions()) {
                 region.updateLastActiveTime();
             }
             // Update versions file to 3

AreaShop/src/main/java/me/wiefferink/areashop/regions/BuyRegion.java

@@ -16,550 +16,471 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
-import java.util.Calendar;
 import java.util.UUID;
 
-public class BuyRegion extends GeneralRegion {
+public class BuyRegion extends TransactionalRegion {
 
-	public BuyRegion(YamlConfiguration config) {
-		super(config);
-	}
+    private static final String UNKNOWN_BUYER = "<UNKNOWN>";
 
-	public BuyRegion(String name, World world) {
-		super(name, world);
-	}
+    public BuyRegion(YamlConfiguration config) {
+        super(config, RegionType.BUY);
+    }
 
-	@Override
-	public RegionType getType() {
-		return RegionType.BUY;
-	}
+    public BuyRegion(String name, World world) {
+        super(name, world, RegionType.BUY);
+    }
 
-	@Override
-	public RegionState getState() {
-		if(isSold() && isInResellingMode()) {
-			return RegionState.RESELL;
-		} else if(isSold() && !isInResellingMode()) {
-			return RegionState.SOLD;
-		} else {
-			return RegionState.FORSALE;
-		}
-	}
+    @Override
+    public RegionState getState() {
+        if (isSold() && isInResellingMode()) {
+            return RegionState.RESELL;
+        } else if (isSold() && !isInResellingMode()) {
+            return RegionState.SOLD;
+        } else {
+            return RegionState.FORSALE;
+        }
+    }
 
-	@Override
-	public boolean isAvailable() {
-		return !isSold();
-	}
+    /**
+     * Get the UUID of the owner of this region.
+     *
+     * @return The UUID of the owner of this region
+     */
+    @Deprecated
+    public UUID getBuyer() {
+        String buyer = config.getString("buy.buyer");
+        if (buyer != null) {
+            try {
+                return UUID.fromString(buyer);
+            } catch (IllegalArgumentException e) {
+                // Incorrect UUID
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Get the UUID of the owner of this region.
-	 * @return The UUID of the owner of this region
-	 */
-	public UUID getBuyer() {
-		String buyer = config.getString("buy.buyer");
-		if(buyer != null) {
-			try {
-				return UUID.fromString(buyer);
-			} catch(IllegalArgumentException e) {
-				// Incorrect UUID
-			}
-		}
-		return null;
-	}
+    /**
+     * Set the buyer of this region.
+     *
+     * @param buyer The UUID of the player that should be set as buyer
+     */
+    @Deprecated
+    public void setBuyer(UUID buyer) {
+        if (buyer == null) {
+            setSetting("buy.buyer", null);
+            setSetting("buy.buyerName", null);
+        } else {
+            setSetting("buy.buyer", buyer.toString());
+            setSetting("buy.buyerName", Utils.toName(buyer));
+        }
+        this.setTransactionHolder(buyer);
+    }
 
-	/**
-	 * Check if a player is the buyer of this region.
-	 * @param player Player to check
-	 * @return true if this player owns this region, otherwise false
-	 */
-	public boolean isBuyer(OfflinePlayer player) {
-		return player != null && isBuyer(player.getUniqueId());
-	}
+    /**
+     * Check if a player is the buyer of this region.
+     *
+     * @param player Player to check
+     * @return true if this player owns this region, otherwise false
+     */
+    @Deprecated
+    public boolean isBuyer(OfflinePlayer player) {
+        return player != null && isBuyer(player.getUniqueId());
+    }
 
-	public boolean isBuyer(UUID player) {
-		UUID buyer = getBuyer();
-		return !(buyer == null || player == null) && buyer.equals(player);
-	}
+    @Deprecated
+    public boolean isBuyer(UUID player) {
+        UUID buyer = getBuyer();
+        return !(buyer == null || player == null) && buyer.equals(player);
+    }
 
-	/**
-	 * Set the buyer of this region.
-	 * @param buyer The UUID of the player that should be set as buyer
-	 */
-	public void setBuyer(UUID buyer) {
-		if(buyer == null) {
-			setSetting("buy.buyer", null);
-			setSetting("buy.buyerName", null);
-		} else {
-			setSetting("buy.buyer", buyer.toString());
-			setSetting("buy.buyerName", Utils.toName(buyer));
-		}
-	}
+    /**
+     * Get the name of the player that owns this region.
+     *
+     * @return The name of the player that owns this region, if unavailable by UUID it will return the old cached name, if that is unavailable it will return &lt;UNKNOWN&gt;
+     */
+    public String getPlayerName() {
+        String result = Utils.toName(getBuyer());
+        if (result.isEmpty()) {
+            result = getStringSetting("buy.buyerName");
+            if (result == null || result.isEmpty()) {
+                result = UNKNOWN_BUYER;
+            }
+        }
+        return result;
+    }
 
-	/**
-	 * Get the name of the player that owns this region.
-	 * @return The name of the player that owns this region, if unavailable by UUID it will return the old cached name, if that is unavailable it will return &lt;UNKNOWN&gt;
-	 */
-	public String getPlayerName() {
-		String result = Utils.toName(getBuyer());
-		if(result == null || result.isEmpty()) {
-			result = getStringSetting("buy.buyerName");
-			if(result == null || result.isEmpty()) {
-				result = "<UNKNOWN>";
-			}
-		}
-		return result;
-	}
+    /**
+     * Check if the region is being resold.
+     *
+     * @return true if the region is available for reselling, otherwise false
+     */
+    public boolean isInResellingMode() {
+        return config.getBoolean("buy.resellMode");
+    }
 
-	/**
-	 * Check if the region is sold.
-	 * @return true if the region is sold, otherwise false
-	 */
-	public boolean isSold() {
-		return getBuyer() != null;
-	}
+    /**
+     * Get the resell price of this region.
+     *
+     * @return The resell price if isInResellingMode(), otherwise 0.0
+     */
+    public double getResellPrice() {
+        return Math.max(0, config.getDouble("buy.resellPrice"));
+    }
 
-	/**
-	 * Check if the region is being resold.
-	 * @return true if the region is available for reselling, otherwise false
-	 */
-	public boolean isInResellingMode() {
-		return config.getBoolean("buy.resellMode");
-	}
+    /**
+     * Get the formatted string of the resellprice (includes prefix and suffix).
+     *
+     * @return The formatted string of the resellprice
+     */
+    public String getFormattedResellPrice() {
+        return Utils.formatCurrency(getResellPrice());
+    }
 
-	/**
-	 * Get the price of the region.
-	 * @return The price of the region
-	 */
-	public double getPrice() {
-		return Math.max(0, Utils.evaluateToDouble(getStringSetting("buy.price"), this));
-	}
+    /**
+     * Set the region into resell mode with the given price.
+     *
+     * @param price The price this region should be put up for sale
+     */
+    public void enableReselling(double price) {
+        setSetting("buy.resellMode", true);
+        setSetting("buy.resellPrice", price);
+    }
 
-	/**
-	 * Get the resell price of this region.
-	 * @return The resell price if isInResellingMode(), otherwise 0.0
-	 */
-	public double getResellPrice() {
-		return Math.max(0, config.getDouble("buy.resellPrice"));
-	}
+    /**
+     * Stop this region from being in resell mode.
+     */
+    public void disableReselling() {
+        setSetting("buy.resellMode", null);
+        setSetting("buy.resellPrice", null);
+    }
 
-	/**
-	 * Get the formatted string of the price (includes prefix and suffix).
-	 * @return The formatted string of the price
-	 */
-	public String getFormattedPrice() {
-		return Utils.formatCurrency(getPrice());
-	}
+    @Override
+    public Object provideReplacement(String variable) {
+        switch (variable) {
+            case AreaShop.tagResellPrice:
+                return getFormattedResellPrice();
+            case AreaShop.tagRawResellPrice:
+                return getResellPrice();
+            default:
+                return super.provideReplacement(variable);
+        }
+    }
 
-	/**
-	 * Get the formatted string of the resellprice (includes prefix and suffix).
-	 * @return The formatted string of the resellprice
-	 */
-	public String getFormattedResellPrice() {
-		return Utils.formatCurrency(getResellPrice());
-	}
+    /**
+     * Minutes until automatic unrent when player is offline.
+     *
+     * @return The number of milliseconds until the region is unrented while player is offline
+     */
+    @Deprecated
+    public long getInactiveTimeUntilSell() {
+        return Utils.getDurationFromMinutesOrStringInput(getStringSetting("buy.inactiveTimeUntilSell"));
+    }
 
-	/**
-	 * Change the price of the region.
-	 * @param price The price to set this region to
-	 */
-	public void setPrice(Double price) {
-		setSetting("buy.price", price);
-	}
+    /**
+     * Get a human readable string indicating how long the player can be offline until automatic unrent.
+     *
+     * @return String indicating the inactive time until unrent
+     */
+    @Deprecated
+    public String getFormattedInactiveTimeUntilSell() {
+        return Utils.millisToHumanFormat(getInactiveTimeUntilSell());
+    }
 
-	/**
-	 * Set the region into resell mode with the given price.
-	 * @param price The price this region should be put up for sale
-	 */
-	public void enableReselling(double price) {
-		setSetting("buy.resellMode", true);
-		setSetting("buy.resellPrice", price);
-	}
+    /**
+     * Buy a region.
+     *
+     * @param offlinePlayer The player that wants to buy the region
+     * @return true if it succeeded and false if not
+     */
+    @SuppressWarnings("deprecation")
+    public boolean buy(OfflinePlayer offlinePlayer) {
+        // Check if the player has permission
+        if (!plugin.hasPermission(offlinePlayer, "areashop.buy")) {
+            message(offlinePlayer, "buy-noPermission");
+            return false;
+        }
 
-	/**
-	 * Stop this region from being in resell mode.
-	 */
-	public void disableReselling() {
-		setSetting("buy.resellMode", null);
-		setSetting("buy.resellPrice", null);
-	}
+        if (plugin.getEconomy() == null) {
+            message(offlinePlayer, "general-noEconomy");
+            return false;
+        }
 
-	/**
-	 * Get the moneyBack percentage.
-	 * @return The % of money the player will get back when selling
-	 */
-	public double getMoneyBackPercentage() {
-		return Utils.evaluateToDouble(getStringSetting("buy.moneyBack"), this);
-	}
+        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;
+            }
+        }
 
-	/**
-	 * Get the amount of money that should be paid to the player when selling the region.
-	 * @return The amount of money the player should get back
-	 */
-	public double getMoneyBackAmount() {
-		return getPrice() * (getMoneyBackPercentage() / 100.0);
-	}
+        if (getWorld() == null) {
+            message(offlinePlayer, "general-noWorld");
+            return false;
+        }
 
-	/**
-	 * Get the formatted string of the amount of the moneyBack amount.
-	 * @return String with currency symbols and proper fractional part
-	 */
-	public String getFormattedMoneyBackAmount() {
-		return Utils.formatCurrency(getMoneyBackAmount());
-	}
+        if (getRegion() == null) {
+            message(offlinePlayer, "general-noRegion");
+            return false;
+        }
 
-	@Override
-	public Object provideReplacement(String variable) {
-		switch(variable) {
-			case AreaShop.tagPrice:
-				return getFormattedPrice();
-			case AreaShop.tagRawPrice:
-				return getPrice();
-			case AreaShop.tagPlayerName:
-				return getPlayerName();
-			case AreaShop.tagPlayerUUID:
-				return getBuyer();
-			case AreaShop.tagResellPrice:
-				return getFormattedResellPrice();
-			case AreaShop.tagRawResellPrice:
-				return getResellPrice();
-			case AreaShop.tagMoneyBackAmount:
-				return getFormattedMoneyBackAmount();
-			case AreaShop.tagRawMoneyBackAmount:
-				return getMoneyBackAmount();
-			case AreaShop.tagMoneyBackPercentage:
-				return getMoneyBackPercentage() % 1.0 == 0.0 ? (int)getMoneyBackPercentage() : getMoneyBackPercentage();
-			case AreaShop.tagMaxInactiveTime:
-				return this.getFormattedInactiveTimeUntilSell();
+        if (isSold() && !(isInResellingMode() && !isBuyer(offlinePlayer))) {
+            if (isBuyer(offlinePlayer)) {
+                message(offlinePlayer, "buy-yours");
+            } else {
+                message(offlinePlayer, "buy-someoneElse");
+            }
+            return false;
+        }
 
-			default:
-				return super.provideReplacement(variable);
-		}
-	}
+        boolean isResell = isInResellingMode();
 
-	/**
-	 * Minutes until automatic unrent when player is offline.
-	 * @return The number of milliseconds until the region is unrented while player is offline
-	 */
-	public long getInactiveTimeUntilSell() {
-		return Utils.getDurationFromMinutesOrStringInput(getStringSetting("buy.inactiveTimeUntilSell"));
-	}
+        // 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;
+            }
+        }
 
-	/**
-	 * Get a human readable string indicating how long the player can be offline until automatic unrent.
-	 * @return String indicating the inactive time until unrent
-	 */
-	public String getFormattedInactiveTimeUntilSell() {
-		return Utils.millisToHumanFormat(getInactiveTimeUntilSell());
-	}
+        // 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;
+        }
 
-	/**
-	 * Buy a region.
-	 * @param offlinePlayer The player that wants to buy the region
-	 * @return true if it succeeded and false if not
-	 */
-	@SuppressWarnings("deprecation")
-	public boolean buy(OfflinePlayer offlinePlayer) {
-		// Check if the player has permission
-		if(!plugin.hasPermission(offlinePlayer, "areashop.buy")) {
-			message(offlinePlayer, "buy-noPermission");
-			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;
+        }
 
-		if(plugin.getEconomy() == null) {
-			message(offlinePlayer, "general-noEconomy");
-			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;
+            }
 
-		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;
-			}
-		}
+            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();
 
-		if(getWorld() == null) {
-			message(offlinePlayer, "general-noWorld");
-			return false;
-		}
+            // Set the owner
+            setBuyer(offlinePlayer.getUniqueId());
+            updateLastActiveTime();
 
-		if(getRegion() == null) {
-			message(offlinePlayer, "general-noRegion");
-			return false;
-		}
+            // Update everything
+            handleSchematicEvent(RegionEvent.RESELL);
 
-		if (isSold() && !(isInResellingMode() && !isBuyer(offlinePlayer))) {
-			if(isBuyer(offlinePlayer)) {
-				message(offlinePlayer, "buy-yours");
-			} else {
-				message(offlinePlayer, "buy-someoneElse");
-			}
-			return false;
-		}
+            // Notify about updates
+            this.notifyAndUpdate(new ResoldRegionEvent(this, oldOwner));
 
-		boolean isResell = isInResellingMode();
+            // 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;
+            }
 
-		// 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;
-			}
-		}
+            // 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());
+                }
+            }
 
-		// 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;
-		}
+            // Set the owner
+            setBuyer(offlinePlayer.getUniqueId());
+            updateLastActiveTime();
 
-		// 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;
-		}
+            // Send message to the player
+            message(offlinePlayer, "buy-succes");
 
-		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;
-			}
+            // Update everything
+            handleSchematicEvent(RegionEvent.BOUGHT);
 
-			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();
+            // Notify about updates
+            this.notifyAndUpdate(new BoughtRegionEvent(this));
+        }
+        return true;
+    }
 
-			// Set the owner
-			setBuyer(offlinePlayer.getUniqueId());
-			updateLastActiveTime();
+    /**
+     * Sell a purchased region, get part of the money back.
+     *
+     * @param giveMoneyBack true if the player should be given money back, otherwise false
+     * @param executor      CommandSender to receive a message when the sell fails, or null
+     * @return true if the region has been sold, otherwise false
+     */
+    @SuppressWarnings("deprecation")
+    public boolean sell(boolean giveMoneyBack, CommandSender executor) {
+        boolean own = executor instanceof Player && this.isBuyer((Player) executor);
+        if (executor != null) {
+            if (!executor.hasPermission("areashop.sell") && !own) {
+                message(executor, "sell-noPermissionOther");
+                return false;
+            }
+            if (!executor.hasPermission("areashop.sell") && !executor.hasPermission("areashop.sellown") && own) {
+                message(executor, "sell-noPermission");
+                return false;
+            }
+            if (!executor.hasPermission("areashop.sell")
+                    && executor.hasPermission("areashop.sellown")
+                    && own
+                    && getBooleanSetting("buy.sellDisabled")) {
+                message(executor, "sell-disabled");
+                return false;
+            }
+        }
 
-			// Update everything
-			handleSchematicEvent(RegionEvent.RESELL);
+        if (plugin.getEconomy() == null) {
+            return false;
+        }
 
-			// Notify about updates
-			this.notifyAndUpdate(new ResoldRegionEvent(this, oldOwner));
+        // Broadcast and check event
+        SellingRegionEvent event = new SellingRegionEvent(this);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            message(executor, "general-cancelled", event.getReason());
+            return false;
+        }
 
-			// 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;
-			}
+        disableReselling();
+        // Give part of the buying price back
+        double moneyBack = getMoneyBackAmount();
+        if (moneyBack > 0 && giveMoneyBack) {
+            boolean noPayBack = false;
+            OfflinePlayer landlordPlayer = null;
+            if (getLandlord() != null) {
+                landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
+            }
+            String landlordName = getLandlordName();
+            EconomyResponse r;
+            if (landlordName != null) {
+                if (landlordPlayer != null && landlordPlayer.getName() != null) {
+                    r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
+                } else {
+                    r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
+                }
+                if (r == null || !r.transactionSuccess()) {
+                    noPayBack = true;
+                }
+            }
 
-			// 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());
-				}
-			}
+            // Give back the money
+            OfflinePlayer player = Bukkit.getOfflinePlayer(getTransactionHolder());
+            if (player.hasPlayedBefore() && !noPayBack) {
+                EconomyResponse response = null;
+                boolean error = false;
+                try {
+                    if (player.getName() != null) {
+                        response = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
+                    } else if (getPlayerName() != null) {
+                        response = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
+                    }
+                } catch (Exception e) {
+                    error = true;
+                }
+                if (error || response == null || !response.transactionSuccess()) {
+                    AreaShop.warn("Something went wrong with paying back money to " + getPlayerName() + " while selling region " + getName());
+                }
+            }
+        }
 
-			// Set the owner
-			setBuyer(offlinePlayer.getUniqueId());
-			updateLastActiveTime();
+        // Handle schematic save/restore (while %uuid% is still available)
+        handleSchematicEvent(RegionEvent.SOLD);
 
-			// Send message to the player
-			message(offlinePlayer, "buy-succes");
+        // Send message: before actual removal of the buyer so that it is still available for variables
+        message(executor, "sell-sold");
 
-			// Update everything
-			handleSchematicEvent(RegionEvent.BOUGHT);
+        // Remove friends and the owner
+        getFriendsFeature().clearFriends();
+        UUID oldBuyer = getBuyer();
+        setBuyer(null);
+        removeLastActiveTime();
 
-			// Notify about updates
-			this.notifyAndUpdate(new BoughtRegionEvent(this));
-		}
-		return true;
-	}
-
-	/**
-	 * Sell a buyed region, get part of the money back.
-	 * @param giveMoneyBack true if the player should be given money back, otherwise false
-	 * @param executor      CommandSender to receive a message when the sell fails, or null
-	 * @return true if the region has been sold, otherwise false
-	 */
-	@SuppressWarnings("deprecation")
-	public boolean sell(boolean giveMoneyBack, CommandSender executor) {
-		boolean own = executor instanceof Player && this.isBuyer((Player)executor);
-		if(executor != null) {
-			if(!executor.hasPermission("areashop.sell") && !own) {
-				message(executor, "sell-noPermissionOther");
-				return false;
-			}
-			if(!executor.hasPermission("areashop.sell") && !executor.hasPermission("areashop.sellown") && own) {
-				message(executor, "sell-noPermission");
-				return false;
-			}
-			if(!executor.hasPermission("areashop.sell")
-					&& executor.hasPermission("areashop.sellown")
-					&& own
-					&& getBooleanSetting("buy.sellDisabled")) {
-				message(executor, "sell-disabled");
-				return false;
-			}
-		}
-
-		if(plugin.getEconomy() == null) {
-			return false;
-		}
-
-		// Broadcast and check event
-		SellingRegionEvent event = new SellingRegionEvent(this);
-		Bukkit.getPluginManager().callEvent(event);
-		if(event.isCancelled()) {
-			message(executor, "general-cancelled", event.getReason());
-			return false;
-		}
-
-		disableReselling();
-		// Give part of the buying price back
-		double moneyBack = getMoneyBackAmount();
-		if(moneyBack > 0 && giveMoneyBack) {
-			boolean noPayBack = false;
-			OfflinePlayer landlordPlayer = null;
-			if(getLandlord() != null) {
-				landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
-			}
-			String landlordName = getLandlordName();
-			EconomyResponse r;
-			if(landlordName != null) {
-				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
-				} else {
-					r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
-				}
-				if(r == null || !r.transactionSuccess()) {
-					noPayBack = true;
-				}
-			}
-
-			// Give back the money
-			OfflinePlayer player = Bukkit.getOfflinePlayer(getBuyer());
-			if(player != null && !noPayBack) {
-				EconomyResponse response = null;
-				boolean error = false;
-				try {
-					if(player.getName() != null) {
-						response = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
-					} else if(getPlayerName() != null) {
-						response = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
-					}
-				} catch(Exception e) {
-					error = true;
-				}
-				if(error || response == null || !response.transactionSuccess()) {
-					AreaShop.warn("Something went wrong with paying back money to " + getPlayerName() + " while selling region " + getName());
-				}
-			}
-		}
-
-		// 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();
-		setBuyer(null);
-		removeLastActiveTime();
-
-		// Notify about updates
-		this.notifyAndUpdate(new SoldRegionEvent(this, oldBuyer, Math.max(moneyBack, 0)));
-		return true;
-	}
-
-	@Override
-	public boolean checkInactive() {
-		if(isDeleted() || !isSold()) {
-			return false;
-		}
-		long inactiveSetting = getInactiveTimeUntilSell();
-		OfflinePlayer player = Bukkit.getOfflinePlayer(getBuyer());
-		if(inactiveSetting <= 0 || player.isOp()) {
-			return false;
-		}
-		long lastPlayed = getLastActiveTime();
-		//AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis()-player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
-		if(Calendar.getInstance().getTimeInMillis() > (lastPlayed + inactiveSetting)) {
-			AreaShop.info("Region " + getName() + " unrented because of inactivity for player " + getPlayerName());
-			AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis() - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
-			return this.sell(true, null);
-		}
-		return false;
-	}
+        // Notify about updates
+        this.notifyAndUpdate(new SoldRegionEvent(this, oldBuyer, Math.max(moneyBack, 0)));
+        return true;
+    }
 
+    @Override
+    public boolean handleInactivity() {
+        return this.sell(true, null);
+    }
 }
 
 

AreaShop/src/main/java/me/wiefferink/areashop/regions/TransactionalRegion.java

@@ -0,0 +1,240 @@
+package me.wiefferink.areashop.regions;
+
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.util.UUID;
+
+public abstract class TransactionalRegion extends GeneralRegion {
+
+    private final String key;
+
+    private final RegionType type;
+    private UUID transactionHolder;
+    private String transactionHolderName;
+    private double price;
+    private double moneyBackPercentage;
+    private long inactivityThresholdMillis;
+
+    public TransactionalRegion(YamlConfiguration config, RegionType regionType) {
+        super(config);
+        this.type = regionType;
+        this.key = regionType.name().toLowerCase() + ".";
+        this.moneyBackPercentage = config.getDouble(this.key + "moneyBack");
+    }
+
+    public TransactionalRegion(String name, World world, RegionType type) {
+        super(name, world);
+        this.type = type;
+        this.key = type.name().toLowerCase() + ".";
+    }
+
+    protected final void setInactivityThresholdMillis(long inactivityThresholdMillis) {
+        this.inactivityThresholdMillis = inactivityThresholdMillis;
+    }
+
+    @Override
+    public RegionType getType() {
+        return type;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !isSold();
+    }
+
+    /**
+     * Get the UUID of the owner of this region.
+     *
+     * @return The UUID of the owner of this region
+     */
+    public UUID getTransactionHolder() {
+        return transactionHolder;
+    }
+
+    /**
+     * Set the buyer of this region. WARNING - May trigger disk lookup for offline players!
+     *
+     * @param transactionHolder The UUID of the player that should be set as buyer
+     */
+    public void setTransactionHolder(UUID transactionHolder) {
+        if (transactionHolder == null) {
+            this.transactionHolder = null;
+            this.transactionHolderName = null;
+        } else {
+            this.transactionHolder = transactionHolder;
+            String name = Utils.toName(transactionHolder);
+            this.transactionHolderName = name.isEmpty() ? null : name;
+        }
+    }
+
+    /**
+     * Set the buyer of this region.
+     *
+     * @param player The instance of the player.
+     */
+    public void setTransactionHolder(final OfflinePlayer player) {
+        if (player == null) {
+            this.transactionHolder = null;
+            this.transactionHolderName = null;
+        } else {
+            String name = player.getName();
+            this.transactionHolderName = name == null || name.isEmpty() ? null : name;
+        }
+    }
+
+    @Override
+    public void setOwner(UUID player) {
+        setTransactionHolder(player);
+    }
+
+    /**
+     * Check if a player is the buyer/holder of this region.
+     *
+     * @param player Player to check
+     * @return true if this player owns this region, otherwise false
+     */
+    public boolean isTransactionHolder(OfflinePlayer player) {
+        return player != null && player.getUniqueId().equals(transactionHolder);
+    }
+
+    public boolean isTransactionHolder(UUID player) {
+        UUID buyer = getTransactionHolder();
+        return !(buyer == null || player == null) && buyer.equals(player);
+    }
+
+    /**
+     * Get the name of the player that owns this region.
+     *
+     * @return The name of the player that owns this region, if unavailable by UUID it will return the old cached name, if that is unavailable it will return <UNKNOWN>
+     */
+    public String getPlayerName() {
+        return this.transactionHolderName == null ? "<UNKNOWN>" : transactionHolderName;
+    }
+
+    /**
+     * Check if the region is sold.
+     *
+     * @return true if the region is sold, otherwise false
+     */
+    public boolean isSold() {
+        return this.transactionHolder != null;
+    }
+
+    /**
+     * Get the price of the region.
+     *
+     * @return The price of the region
+     */
+    public double getPrice() {
+        return price;
+    }
+
+    /**
+     * Change the price of the region.
+     *
+     * @param price The price to set this region to
+     */
+    public void setPrice(double price) {
+        this.price = price;
+        super.config.set(key + "price", price);
+    }
+
+    /**
+     * Get the formatted string of the price (includes prefix and suffix).
+     *
+     * @return The formatted string of the price
+     */
+    public String getFormattedPrice() {
+        return Utils.formatCurrency(getPrice());
+    }
+
+    /**
+     * Get the moneyBack percentage.
+     *
+     * @return The % of money the player will get back when selling
+     */
+    public double getMoneyBackPercentage() {
+        return moneyBackPercentage;
+    }
+
+    /**
+     * Get the amount of money that should be paid to the player when selling the region.
+     *
+     * @return The amount of money the player should get back
+     */
+    public double getMoneyBackAmount() {
+        return getPrice() * (moneyBackPercentage / 100D);
+    }
+
+    /**
+     * Get the formatted string of the amount of the moneyBack amount.
+     *
+     * @return String with currency symbols and proper fractional part
+     */
+    public String getFormattedMoneyBackAmount() {
+        return Utils.formatCurrency(getMoneyBackAmount());
+    }
+
+    @Override
+    public Object provideReplacement(String variable) {
+        switch (variable) {
+            case AreaShop.tagPrice:
+                return getFormattedPrice();
+            case AreaShop.tagRawPrice:
+                return getPrice();
+            case AreaShop.tagPlayerName:
+                return getPlayerName();
+            case AreaShop.tagPlayerUUID:
+                return getTransactionHolder();
+            case AreaShop.tagMoneyBackAmount:
+                return getFormattedMoneyBackAmount();
+            case AreaShop.tagRawMoneyBackAmount:
+                return getMoneyBackAmount();
+            case AreaShop.tagMoneyBackPercentage:
+                return getMoneyBackPercentage() % 1.0 == 0.0 ? (int) getMoneyBackPercentage() : getMoneyBackPercentage();
+            case AreaShop.tagMaxInactiveTime:
+                return this.getFormattedInactivityThreshold();
+            default:
+                return super.provideReplacement(variable);
+        }
+    }
+
+    public long getInactivityThresholdMillis() {
+        return this.inactivityThresholdMillis;
+    }
+
+    /**
+     * Get a human readable string indicating how long the player can be offline until automatic unrent.
+     *
+     * @return String indicating the inactive time until unrent
+     */
+    public String getFormattedInactivityThreshold() {
+        return Utils.millisToHumanFormat(this.inactivityThresholdMillis);
+    }
+
+    @Override
+    public boolean checkInactivity(final OfflinePlayer player) {
+        if (isDeleted() || !isSold()) {
+            return false;
+        }
+        long inactiveSetting = getInactivityThresholdMillis();
+        if (inactiveSetting <= 0) {
+            return false;
+        }
+        if (player.isOnline()) {
+            return false;
+        }
+        long lastPlayed = getLastActiveTime();
+        long now = System.currentTimeMillis();
+        if (now > (lastPlayed + inactiveSetting)) {
+            AreaShop.info("Region " + getName() + " unrented because of inactivity for player " + getPlayerName());
+            AreaShop.debug("currentTime=" + now + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (now - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
+            return true;
+        }
+        return false;
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/Analytics.java

@@ -4,140 +4,100 @@ 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 org.bstats.bukkit.Metrics;
 
 import java.util.HashMap;
+import java.util.Map;
 
 public class Analytics {
 
-	private Analytics() {
+    private Analytics() {
 
-	}
+    }
 
-	/**
-	 * Start analytics tracking.
-	 */
-	public static void start() {
-		// bStats statistics
-		try {
-			Metrics metrics = new Metrics(AreaShop.getInstance());
+    /**
+     * Start analytics tracking.
+     */
+    public static void start() {
+        // 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 regions
+            metrics.addCustomChart(new Metrics.SingleLineChart("region_count", () -> 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 rental regions
+            metrics.addCustomChart(new Metrics.SingleLineChart("rental_region_count", () -> {
+                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();
-				}
-			});
+            // Number of buy regions
+            metrics.addCustomChart(new Metrics.SingleLineChart("buy_region_count", () -> AreaShop.getInstance().getFileManager().getBuys().size()));
 
-			// Language
-			metrics.addCustomChart(new Metrics.SimplePie("language") {
-				@Override
-				public String getValue() {
-					return AreaShop.getInstance().getConfig().getString("language");
-				}
-			});
+            // Language
+            metrics.addCustomChart(new Metrics.SimplePie("language", () -> 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;
-				}
-			});
+            // Pie with region states
+            metrics.addCustomChart(new Metrics.AdvancedPie("region_state", () -> {
+                Map<String, Integer> map = new HashMap<>();
+                RegionStateStats stats = getStateStats();
+                map.put("For Rent", stats.forrent);
+                map.put("Rented", stats.rented);
+                map.put("For Sale", stats.forsale);
+                map.put("Sold", stats.sold);
+                map.put("Reselling", stats.reselling);
+                return map;
+            }));
 
-			// 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;
-				}
-			});
+            // Time series of each region state
+            metrics.addCustomChart(new Metrics.SingleLineChart("forrent_region_count", () -> getStateStats().forrent));
 
-			// TODO track rent/buy/unrent/sell/resell actions (so that it can be reported per collection interval)
+            metrics.addCustomChart(new Metrics.SingleLineChart("rented_region_count", () -> getStateStats().rented));
 
-			AreaShop.debug("Started bstats.org statistics service");
-		} catch(Exception e) {
-			AreaShop.debug("Could not start bstats.org statistics service");
-		}
-	}
+            metrics.addCustomChart(new Metrics.SingleLineChart("forsale_region_count", () -> getStateStats().forsale));
 
-	private static class RegionStateStats {
-		int forrent = 0;
-		int forsale = 0;
-		int rented = 0;
-		int sold = 0;
-		int reselling = 0;
-	}
+            metrics.addCustomChart(new Metrics.SingleLineChart("sold_region_count", () -> getStateStats().sold));
 
-	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;
-	}
+            metrics.addCustomChart(new Metrics.SingleLineChart("reselling_region_count", () -> 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 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;
+    }
+
+    private static class RegionStateStats {
+        int forrent = 0;
+        int forsale = 0;
+        int rented = 0;
+        int sold = 0;
+        int reselling = 0;
+    }
 
 }

AreaShop/src/main/java/me/wiefferink/areashop/tools/ChunkUtils.java

@@ -0,0 +1,28 @@
+package me.wiefferink.areashop.tools;
+
+import org.bukkit.Chunk;
+
+public class ChunkUtils {
+
+    private final long twoPower32 = Integer.MAX_VALUE + 1L;
+
+    public static long getPackedChunkCoords(Chunk chunk) {
+        return packToLong(chunk.getX(), chunk.getZ());
+    }
+
+    public static long packToLong(int primary, int secondary) {
+        return (long) primary & 0xffffffffL | ((long) secondary & 0xffffffffL) << 32;
+    }
+
+    public static int getChunkX(long packed) {
+        return (int) packed;
+    }
+
+    public static int getChunkZ(long packed) {
+        return (int) (packed >> 32);
+    }
+
+    public static int[] getChunkCoords(long packed) {
+        return new int[]{(int) packed, (int) (packed >> 32)};
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/Materials.java

@@ -126,7 +126,7 @@ public class Materials {
 	 * @return true if the given material is a sign
 	 */
 	public static boolean isSign(String name) {
-		return name != null && (FLOOR_SIGN_TYPES.contains(name) || WALL_SIGN_TYPES.contains(name));
+		return name != null && name.toUpperCase().contains("SIGN");
 	}
 
 }

AreaShop/src/main/java/me/wiefferink/areashop/tools/Utils.java

@@ -828,15 +828,29 @@ public class Utils {
      * @return the name of the player
      */
     public static String toName(UUID uuid) {
-        if (uuid == null) {
-            return "";
-        } else {
+        if (uuid != null) {
             String name = Bukkit.getOfflinePlayer(uuid).getName();
             if (name != null) {
                 return name;
             }
-            return "";
         }
+        return "";
+    }
+
+    public static CompletableFuture<String> toNameAsync(UUID uuid) {
+        if (uuid == null) {
+            return CompletableFuture.completedFuture("");
+        }
+        CompletableFuture<String> completableFuture = new CompletableFuture<>();
+        Bukkit.getScheduler().runTaskAsynchronously(AreaShop.getInstance(), () -> {
+            final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(uuid);
+            if (!offlinePlayer.hasPlayedBefore()) {
+                completableFuture.complete("");
+            } else {
+                completableFuture.complete(offlinePlayer.getName());
+            }
+        });
+        return completableFuture;
     }
 
     /**
@@ -867,19 +881,20 @@ public class Utils {
         if (batchSize < 1) {
             throw new IllegalArgumentException("Invalid batch size!");
         }
-        final Queue<E> cloned = new LinkedList<>(objects);
+        final List<E> cloned = new ArrayList<>(objects);
         final CompletableFuture<Object> future = new CompletableFuture<>();
         BukkitRunnable runnable = new BukkitRunnable() {
+            int lastIndex;
 
             @Override
             public void run() {
-                if (cloned.isEmpty()) {
+                if (lastIndex >= cloned.size() - 1) {
                     future.complete(true);
                     cancel();
+                    return;
                 }
-                for (int i = 0; i < batchSize && !cloned.isEmpty(); i++) {
-                    task.accept(cloned.remove());
-                }
+                int index = Math.min(batchSize, objects.size() - 1);
+                cloned.subList(lastIndex, index).forEach(task);
             }
         };
         if (async) {

AreaShop/src/main/resources/config.yml

@@ -1,181 +1,181 @@
-# ╔════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
-# ║ config.yml file of the AreaShop plugin created by NLThijs48, Github can be found at https://github.com/NLthijs48/AreaShop. ║
-# ║ This file contains options to change the working of the plugin, the profiles defined here can be used in default.yml.      ║
-# ║ More information and tutorials can be found on the wiki: https://github.com/NLthijs48/AreaShop/wiki                        ║
-# ╚════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ GENERAL: Options that influence the global state of the plugin                                                             │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# Chat prefix used for all messages in the chat, also changes the greeting messages.
-chatPrefix:
-  - '[darkgreen][AreaShop][reset]'
-  - '  hover: AreaShop region management plugin'
-  - '  hover: %lang:action|Click to check the available commands|%'
-  - '  command: /areashop help'
-  - ' '
-# The language file that should be used, check the 'lang' folder for build-in languages (use the filename without .yml here).
-# More information can be found here: https://github.com/NLthijs48/AreaShop/wiki/Language-support.
-language: EN
-# The tags that need to be written on the first line of a sign to add it to AreaShop.
-signTags:
-  # Add a rental region.
-  rent: '[asrent]'
-  # Add a buy region.
-  buy: '[asbuy]'
-  # Add a sign to an existing region.
-  add: '[as]'
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ ECONOMY: Options to change the display of prices.                                                                          │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# The characters displayed before a price.
-moneyCharacter: '$'
-# The characters displayed after a price.
-moneyCharacterAfter: ''
-# The character(s) to use as decimal mark.
-decimalMark: '.'
-# How many numbers behind the dot should be shown (2 will make numbers like '8.55', '9.01', '5.20').
-fractionalNumbers: 2
-# How many numbers behind the dot should be shown when using a metric symbol suffix.
-fractionalNumbersShort: 3
-# Set this to true if you want to hide '.0' for a number like '15.0' ('4.50' will still stay '4.50').
-hideEmptyFractionalPart: true
-# Use a suffix if the price is above a certain number (use 1.00M instead of 1000000.00 etc.)
-metricSymbols:
-  #1000: "k"
-  1000000: "M"
-  1000000000: "G"
-  1000000000000: "T"
-  1000000000000000: "P"
-  1000000000000000000: "E"
-  1000000000000000000000: "Z"
-  1000000000000000000000000: "Y"
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ RENTING: Options that apply to all rent regions.                                                                           │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# Timeformat to use on the signs, default is like '30-06 14:52', US format: 'MM-dd KK:mm a'.
-# Search for 'java SimpleDateFormat' for more options and documentation.
-timeFormatSign: 'dd-MM HH:mm'
-# Timeformat used in the chat, default is like '30 june 2014 14:52', US format: 'MMMMMMMMMMMMMMMMM dd yyyy KK:mm a'.
-# Search for 'java SimpleDateFormat' for more options and documentation.
-timeFormatChat: 'dd MMMMMMMMMMMMMMMMM yyyy HH:mm'
-# Time indicators, used for specifing time periods (for example rent duration).
-seconds: [s, sec, secs, second, seconds]
-minutes: [m, min, mins, minute, minutes]
-hours: [h, hour, hours]
-days: [d, day, days]
-weeks: [w, week, weeks]
-months: [M,  month,  months]
-years: [y, year, years]
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ PERMISSION GROUPS: Assigned by giving players certain permissions.                                                         │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# Configure the max total regions, max rent regions and max buy regions with different groups (-1 is unlimited).
-# Assign a group to players by giving them the permission 'areashop.limits.<group>'.
-# Every player already has the group 'default', OPs bypass the limits because of the 'areashop.limitbypass' permission.
-# All the groups applied to the player will be checked and only if they all allow an extra region it will be allowed.
-# More information like limits for regions of a certain group or in a certain word can be found here:
-#   https://github.com/NLthijs48/AreaShop/wiki/Limitgroups-information-and-examples.
-limitGroups:
-  default:
-    total: 1
-    rents: 1
-    buys: 1
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ ADVANCED AND DEBUG: Specific options to tweak the plugin precisely and check if it functions correctly.                    │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# Blacklist of region names that cannot be added to AreaShop for renting or buying. Regular expressions can be used, search
-# for 'java regex pattern' to find documentation about how to use it.
-# Example: Blocking all regions that have a name like 'house_1', 'house_2', etc. would be done with 'house_\d+'.
-# The '\d' represents the numerical digits 0-9, the + symbol represents 1 or more times repeated.
-# This means it would also block 'house_123' and 'house_000456'. It will not block 'ahouse_1' or 'house_'.
-blacklist:
-  - '__global__'
-# Minimum length of the numbers that are suffixed for region names generated by the '/as stack' command.
-# When having this at 3 it will generate names like this: 'region-001', 'region-014', 'region-4567'.
-stackRegionNumberLength: 3
-# Allow/disallow adding players that did not visit the server yet as friend of a region.
-addFriendNotExistingPlayers: false
-# Enable sending stats to http://mcstats.org/ (Metrics plugin).
-# This information will give me an indication about how much the plugin is used and encourages me to continue development.
-sendStats: true
-# If enabled it will check for updates when loading the plugin, it will never download files, it will only notify about it.
-checkForUpdates: true
-# Use colors when sending messages to console and log files.
-useColorsInConsole: false
-# Use tellraw style messages, which can be interacted with by players
-useFancyMessages: true
-# Update all region flags and signs after starting the plugin.
-# This ensures that changes to the config are directly visible after restarting the server.
-updateRegionsOnStartup: true
-# Enables / disables debug messages in the console, could be useful to figure out where errors come from.
-debug: false
-# Version of the config, do not change!
-version: ${project.version}
-# Maximum number of blocks to save to or restore from a .schemetic file.
-maximumBlocks: 1000000
-# Maximum number of locations the teleport function should check to find a safe spot.
-maximumTries: 50000
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ VARIABLES: Variables that can be used in messages and settings where a region is available.                                │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# If a tag has no value (for example %player% when the region is not rented/bought) then the tag will not get replaced.
-# %region%         The region name (with correct capitalization).
-# %player%         The name of the player that rents/buys the region (with correct capitalization).
-# %uuid%           The UUID of the player that rents/buys the region.
-# %friends%        The names of friends added to this region separated by ', '.
-# %friendsuuid%    The UUID's of friends added to this region separated by ', '.
-# %landlord%       The name of the landlord.
-# %landlorduuid%   The UUID of the landlord.
-# %price%          The price of the region formatted with the configured characters before and after the number.
-# %rawprice%       The price without formatting, like '10.0' or '7.77'.
-# %duration%       The duration of a rent region, for example '1 d', '4 minutes' or '2 years'.
-# %world%          The name of the world that the region is in.
-# %type%           The type of the region, 'rent' or 'buy'.
-# %until%          The end time of a rent formatted as configured with 'timeFormatChat'.
-# %untilshort%     The end time of a rent formatted as configured with 'timeFormatSign'.
-# %width%          The width of the region (number of blocks on the x-axis).
-# %depth%          The depth of the region (number of blocks on the z-axis).
-# %volume%         The number of blocks in a region (accounting for polygon shaped regions).
-# %height%         The height of the region (number of blocks on the y-axis).
-# %timeleft%       The time left on the rent (uses the unit of time that fits best, minutes used from 121 seconds till 120 minutes).
-# %clicker%        The name of the player that clicked the sign (only to be used in the signProfiles section).
-# %resellprice%    The price of a region when it is in resell mode.
-# %rawresellprice% The resellprice without formatting.
-# %moneyback%      The amount of money the player will get back when unrenting/selling the region (formatted with currency layout).
-# %rawmoneyback%   The moneyback without formatting.
-# %moneybackpercent% The percentage of the price the player will get back when unrenting the region.
-# %timesExtended%  The number of times the region has been extended (zero when first rented)
-# %maxextends%     The maximum number of extends a player can do on the region.
-# %extendsleft%    The number of extends that are left (maxextends - timesextended).
-# %maxrenttime%    The maximum time you can rent a region in advance (human readable).
-# %inactivetime%   The maximum time a player may be inactive before unrent/sell (human readable).
-# %year%           The current year.
-# %month%          The current month in the year.
-# %day%            The current day in the month.
-# %hour%           The current hour in the day (0-23).
-# %minute%         The current minute of the hour.
-# %second%         The current second of the minute.
-# %millisecond%    The current millisecond of the second.
-# %epoch%          The number of milliseconds since January 1, 1970 (Unix Epoch).
-# %tpx%            The exact x coordinate of the location that the teleport is set to
-# %tpy%            The exact y coordinate of the location that the teleport is set to
-# %tpz%            The exact z coordinate of the location that the teleport is set to
-# %tpblockx%       The rounded x coordinate of the location that the teleport is set to
-# %tpblocky%       The rounded y coordinate of the location that the teleport is set to
-# %tpblockz%       The rounded z coordinate of the location that the teleport is set to
-# %tppitch%        The exact pitch of the teleport location
-# %tppitchround%   The rounded pitch of the teleport location
-# %tpyaw%          The exact yaw of the teleport location
-# %tpyawround%     The rounded yaw of the teleport location
-# %tpworld%        The world name of the teleport location
-# %lang:<languageKey>|Optional arguments|%  Insert a message from EN.yml, for example: '%lang:timeleft-ended%' or '%lang:timeleft-years|15|%'
+# ╔════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
+# ║ config.yml file of the AreaShop plugin created by NLThijs48, Github can be found at https://github.com/NLthijs48/AreaShop. ║
+# ║ This file contains options to change the working of the plugin, the profiles defined here can be used in default.yml.      ║
+# ║ More information and tutorials can be found on the wiki: https://github.com/NLthijs48/AreaShop/wiki                        ║
+# ╚════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ GENERAL: Options that influence the global state of the plugin                                                             │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# Chat prefix used for all messages in the chat, also changes the greeting messages.
+chatPrefix:
+  - '[darkgreen][AreaShop][reset]'
+  - '  hover: AreaShop region management plugin'
+  - '  hover: %lang:action|Click to check the available commands|%'
+  - '  command: /areashop help'
+  - ' '
+# The language file that should be used, check the 'lang' folder for build-in languages (use the filename without .yml here).
+# More information can be found here: https://github.com/NLthijs48/AreaShop/wiki/Language-support.
+language: EN
+# The tags that need to be written on the first line of a sign to add it to AreaShop.
+signTags:
+  # Add a rental region.
+  rent: '[asrent]'
+  # Add a buy region.
+  buy: '[asbuy]'
+  # Add a sign to an existing region.
+  add: '[as]'
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ ECONOMY: Options to change the display of prices.                                                                          │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# The characters displayed before a price.
+moneyCharacter: '$'
+# The characters displayed after a price.
+moneyCharacterAfter: ''
+# The character(s) to use as decimal mark.
+decimalMark: '.'
+# How many numbers behind the dot should be shown (2 will make numbers like '8.55', '9.01', '5.20').
+fractionalNumbers: 2
+# How many numbers behind the dot should be shown when using a metric symbol suffix.
+fractionalNumbersShort: 3
+# Set this to true if you want to hide '.0' for a number like '15.0' ('4.50' will still stay '4.50').
+hideEmptyFractionalPart: true
+# Use a suffix if the price is above a certain number (use 1.00M instead of 1000000.00 etc.)
+metricSymbols:
+  #1000: "k"
+  1000000: "M"
+  1000000000: "G"
+  1000000000000: "T"
+  1000000000000000: "P"
+  1000000000000000000: "E"
+  1000000000000000000000: "Z"
+  1000000000000000000000000: "Y"
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ RENTING: Options that apply to all rent regions.                                                                           │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# Timeformat to use on the signs, default is like '30-06 14:52', US format: 'MM-dd KK:mm a'.
+# Search for 'java SimpleDateFormat' for more options and documentation.
+timeFormatSign: 'dd-MM HH:mm'
+# Timeformat used in the chat, default is like '30 june 2014 14:52', US format: 'MMMMMMMMMMMMMMMMM dd yyyy KK:mm a'.
+# Search for 'java SimpleDateFormat' for more options and documentation.
+timeFormatChat: 'dd MMMMMMMMMMMMMMMMM yyyy HH:mm'
+# Time indicators, used for specifing time periods (for example rent duration).
+seconds: [s, sec, secs, second, seconds]
+minutes: [m, min, mins, minute, minutes]
+hours: [h, hour, hours]
+days: [d, day, days]
+weeks: [w, week, weeks]
+months: [M,  month,  months]
+years: [y, year, years]
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ PERMISSION GROUPS: Assigned by giving players certain permissions.                                                         │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# Configure the max total regions, max rent regions and max buy regions with different groups (-1 is unlimited).
+# Assign a group to players by giving them the permission 'areashop.limits.<group>'.
+# Every player already has the group 'default', OPs bypass the limits because of the 'areashop.limitbypass' permission.
+# All the groups applied to the player will be checked and only if they all allow an extra region it will be allowed.
+# More information like limits for regions of a certain group or in a certain word can be found here:
+#   https://github.com/NLthijs48/AreaShop/wiki/Limitgroups-information-and-examples.
+limitGroups:
+  default:
+    total: 1
+    rents: 1
+    buys: 1
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ ADVANCED AND DEBUG: Specific options to tweak the plugin precisely and check if it functions correctly.                    │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# Blacklist of region names that cannot be added to AreaShop for renting or buying. Regular expressions can be used, search
+# for 'java regex pattern' to find documentation about how to use it.
+# Example: Blocking all regions that have a name like 'house_1', 'house_2', etc. would be done with 'house_\d+'.
+# The '\d' represents the numerical digits 0-9, the + symbol represents 1 or more times repeated.
+# This means it would also block 'house_123' and 'house_000456'. It will not block 'ahouse_1' or 'house_'.
+blacklist:
+  - '__global__'
+# Minimum length of the numbers that are suffixed for region names generated by the '/as stack' command.
+# When having this at 3 it will generate names like this: 'region-001', 'region-014', 'region-4567'.
+stackRegionNumberLength: 3
+# Allow/disallow adding players that did not visit the server yet as friend of a region.
+addFriendNotExistingPlayers: false
+# Enable sending stats to http://mcstats.org/ (Metrics plugin).
+# This information will give me an indication about how much the plugin is used and encourages me to continue development.
+sendStats: true
+# If enabled it will check for updates when loading the plugin, it will never download files, it will only notify about it.
+checkForUpdates: true
+# Use colors when sending messages to console and log files.
+useColorsInConsole: false
+# Use tellraw style messages, which can be interacted with by players
+useFancyMessages: true
+# Update all region flags and signs after starting the plugin.
+# This ensures that changes to the config are directly visible after restarting the server.
+updateRegionsOnStartup: true
+# Enables / disables debug messages in the console, could be useful to figure out where errors come from.
+debug: false
+# Version of the config, do not change!
+version: ${project.version}
+# Maximum number of blocks to save to or restore from a .schemetic file.
+maximumBlocks: 1000000
+# Maximum number of locations the teleport function should check to find a safe spot.
+maximumTries: 50000
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ VARIABLES: Variables that can be used in messages and settings where a region is available.                                │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# If a tag has no value (for example %player% when the region is not rented/bought) then the tag will not get replaced.
+# %region%         The region name (with correct capitalization).
+# %player%         The name of the player that rents/buys the region (with correct capitalization).
+# %uuid%           The UUID of the player that rents/buys the region.
+# %friends%        The names of friends added to this region separated by ', '.
+# %friendsuuid%    The UUID's of friends added to this region separated by ', '.
+# %landlord%       The name of the landlord.
+# %landlorduuid%   The UUID of the landlord.
+# %price%          The price of the region formatted with the configured characters before and after the number.
+# %rawprice%       The price without formatting, like '10.0' or '7.77'.
+# %duration%       The duration of a rent region, for example '1 d', '4 minutes' or '2 years'.
+# %world%          The name of the world that the region is in.
+# %type%           The type of the region, 'rent' or 'buy'.
+# %until%          The end time of a rent formatted as configured with 'timeFormatChat'.
+# %untilshort%     The end time of a rent formatted as configured with 'timeFormatSign'.
+# %width%          The width of the region (number of blocks on the x-axis).
+# %depth%          The depth of the region (number of blocks on the z-axis).
+# %volume%         The number of blocks in a region (accounting for polygon shaped regions).
+# %height%         The height of the region (number of blocks on the y-axis).
+# %timeleft%       The time left on the rent (uses the unit of time that fits best, minutes used from 121 seconds till 120 minutes).
+# %clicker%        The name of the player that clicked the sign (only to be used in the signProfiles section).
+# %resellprice%    The price of a region when it is in resell mode.
+# %rawresellprice% The resellprice without formatting.
+# %moneyback%      The amount of money the player will get back when unrenting/selling the region (formatted with currency layout).
+# %rawmoneyback%   The moneyback without formatting.
+# %moneybackpercent% The percentage of the price the player will get back when unrenting the region.
+# %timesExtended%  The number of times the region has been extended (zero when first rented)
+# %maxextends%     The maximum number of extends a player can do on the region.
+# %extendsleft%    The number of extends that are left (maxextends - timesextended).
+# %maxrenttime%    The maximum time you can rent a region in advance (human readable).
+# %inactivetime%   The maximum time a player may be inactive before unrent/sell (human readable).
+# %year%           The current year.
+# %month%          The current month in the year.
+# %day%            The current day in the month.
+# %hour%           The current hour in the day (0-23).
+# %minute%         The current minute of the hour.
+# %second%         The current second of the minute.
+# %millisecond%    The current millisecond of the second.
+# %epoch%          The number of milliseconds since January 1, 1970 (Unix Epoch).
+# %tpx%            The exact x coordinate of the location that the teleport is set to
+# %tpy%            The exact y coordinate of the location that the teleport is set to
+# %tpz%            The exact z coordinate of the location that the teleport is set to
+# %tpblockx%       The rounded x coordinate of the location that the teleport is set to
+# %tpblocky%       The rounded y coordinate of the location that the teleport is set to
+# %tpblockz%       The rounded z coordinate of the location that the teleport is set to
+# %tppitch%        The exact pitch of the teleport location
+# %tppitchround%   The rounded pitch of the teleport location
+# %tpyaw%          The exact yaw of the teleport location
+# %tpyawround%     The rounded yaw of the teleport location
+# %tpworld%        The world name of the teleport location
+# %lang:<languageKey>|Optional arguments|%  Insert a message from EN.yml, for example: '%lang:timeleft-ended%' or '%lang:timeleft-years|15|%'

AreaShop/src/main/resources/plugin.yml

@@ -1,273 +1,276 @@
-name: AreaShop
-main: me.wiefferink.areashop.AreaShop
-version: "${project.version}"
-description: "Selling and renting WorldGuard regions to your players, highly configurable."
-depend: [Vault, WorldGuard, WorldEdit]
-softdepend: [Multiverse-Core, FastAsyncWorldEdit]
-author: NLThijs48
-website: https://github.com/NLthijs48/AreaShop
-commands:
-  AreaShop:
-    description: 'For all commands use /as help.'
-    usage: 'AreaShop has not started correctly, check the log file (or console) and correct any errors.'
-    aliases: [as]
-awareness:
-  - !@UTF8
-api-version: 1.13
-permissions:
-  areashop.*:
-    description: Give access to all commands of AreaShop
-    children:
-      areashop.help: true
-      areashop.createrent: true
-      areashop.createbuy: true
-      areashop.destroyrent: true
-      areashop.destroybuy: true
-      areashop.rent: true
-      areashop.buy: true
-      areashop.buyresell: true
-      areashop.buynormal: true
-      areashop.unrent: true
-      areashop.info: true
-      areashop.reload: true
-      areashop.setrestore: true
-      areashop.setprice: true
-      areashop.setduration: true
-      areashop.teleport: true
-      areashop.teleportall: true
-      areashop.setteleportall: true
-      areashop.teleportsign: true
-      areashop.teleportsignall: true
-      areashop.tabcomplete: true
-      areashop.setteleportoutsideregion: true
-      areashop.find: true
-      areashop.groupadd: true
-      areashop.groupdel: true
-      areashop.grouplist: true
-      areashop.groupinfo: true
-      areashop.limitbypass: true
-      areashop.schematicevents: true
-      areashop.addsign: true
-      areashop.delsign: true
-      areashop.renttimebypass: true
-      areashop.me: true
-      areashop.resellall: true
-      areashop.stopresellall: true
-      areashop.addfriendall: true
-      areashop.delfriendall: true
-      areashop.notifyupdate: true
-      areashop.stack: true
-      areashop.setlandlord: true
-      areashop.linksigns: true
-      areashop.message: true
-      areashop.import: true
-  areashop.landlord.*:
-    description: Give access to all landlord features
-    children:
-      areashop.createrent.owner: true
-      areashop.createbuy.owner: true
-      areashop.setprice.landlord: true
-      areashop.setduration.landlord: true
-      areashop.destroyrent.landlord: true
-      areashop.destroybuy.landlord: true
-  areashop.help:
-    description: Allows you to see the help pages
-    default: true
-  areashop.rent:
-    description: Allows you to rent a region
-    default: true
-  areashop.buy:
-    description: Allows you to buy a region
-    default: true
-  areashop.buyresell:
-    description: Allows you to buy a region that is in resell mode
-    default: true
-  areashop.buynormal:
-    description: Allows you to buy a region that is not in resell mode
-    default: true
-  areashop.unrent:
-    description: Allows you to unrent a specific region
-    default: op
-  areashop.unrentown:
-    description: Allows you to unrent your own region
-    default: true
-  areashop.sell:
-    description: Allows you to sell a specific region
-    default: op
-  areashop.sellown:
-    description: Allows you to sell your own region
-    default: true
-  areashop.createrent:
-    description: Allows you to add rent regions to AreaShop
-    default: op
-  areashop.createrent.member:
-    description: Allows you to add rent regions to AreaShop for which you are registered as member
-    default: false
-  areashop.createrent.owner:
-    description: Allows you to add rent regions to AreaShop for which you are registered as owner
-    default: false
-  areashop.createbuy:
-    description: Allows you to add buy regions to AreaShop
-    default: op
-  areashop.createbuy.member:
-    description: Allows you to add buy regions to AreaShop for which you are registered as member
-    default: false
-  areashop.createbuy.owner:
-    description: Allows you to add buy regions to AreaShop for which you are registered as owner
-    default: false
-  areashop.destroyrent:
-    description: Allows you remove rental regions from AreaShop
-    default: op
-  areashop.destroyrent.landlord:
-    description: Allows you to remove rental regions from AreaShop when you are the landlord
-    default: false
-  areashop.destroybuy:
-    description: Allows you to remove buy regions from AreaShop
-    default: op
-  areashop.destroybuy.landlord:
-    description: Allows you to remove buy regions from AreaShop when you are the landlord
-    default: false
-  areashop.info:
-    description: Allows you check the status of regions and players
-    default: true
-  areashop.reload:
-    description: Allows you to reload the config and update all region flags and signs
-    default: op
-  areashop.setrestore:
-    description: Allows you to change the restore settings
-    default: op
-  areashop.setprice:
-    description: Allows you to change the price
-    default: op
-  areashop.setprice.landlord:
-    description: Allows you to change the price of a region that you are landlord of
-    default: false
-  areashop.setduration:
-    description: Allows you to change the duration of a rent
-    default: op
-  areashop.setduration.landlord:
-    description: Allows you to change the duration of a region that you are landlord of
-    default: false
-  areashop.teleport:
-    description: Teleport to your region
-    default: true
-  areashop.teleportall:
-    description: Teleport to all regions
-    default: op
-  areashop.teleportsign:
-    description: Teleport to signs of regions you own
-    default: true
-  areashop.teleportsignall:
-    description: Teleport to signs of all regions
-    default: op
-  areashop.teleportfriend:
-    description: Teleport to regions where you are added as friend
-    default: true
-  areashop.teleportfriendsign:
-    description: Teleport to the sign of regions where you are added as friend
-    default: true
-  areashop.teleportavailable:
-    description: Teleport to regions which are available
-    default: true
-  areashop.teleportavailablesign:
-    description: Teleport to the sign of regions which are available
-    default: true
-  areashop.setteleport:
-    description: Set the teleport spot for your region
-    default: true
-  areashop.setteleportall:
-    description: Set the teleport for other regions
-    default: op
-  areashop.setteleportoutsideregion:
-    description: Set the teleport location outside the WorldGuard region
-    default: op
-  areashop.tabcomplete:
-    description: Allows you to tabcomplete all commands (also where you dont have permission)
-    default: op
-  areashop.find:
-    description: Allows you to teleport to a free region (/as find)
-    default: true
-  areashop.groupadd:
-    description: Allows you to add regions to groups
-    default: op
-  areashop.groupdel:
-    description: Allows you to delete regions from groups
-    default: op
-  areashop.grouplist:
-    description: Allows you to list all the groups currently created
-    default: op
-  areashop.groupinfo:
-    description: Allows you to display information about a group (all members)
-    default: op
-  areashop.rentextendbypass:
-    description: Bypass the extend limit on rents
-    default: op
-  areashop.limits.default:
-    description: Assign limits as set in the 'default' group in the 'limitGroups' section of the config
-    default: true
-  areashop.limitbypass:
-    description: Bypass the limits for renting/buying regions (how many you can have at the same time)
-    default: op
-  areashop.schematicevents:
-    description: Allows you to trigger schematic events for regions
-    default: op
-  areashop.addsign:
-    description: Allows you to add signs to existing regions
-    default: op
-  areashop.delsign:
-    description: Allows you to delete signs from existing regions
-    default: op
-  areashop.renttimebypass:
-    description: Bypass the maximum rent time you can have in advance
-    default: op
-  areashop.me:
-    description: Allows you to get information about your regions
-    default: true
-  areashop.setownerrent:
-    description: Allows you to set the owner of rent regions
-    default: op
-  areashop.setownerbuy:
-    description: Allows you to set the owner of buy regions
-    default: op
-  areashop.resell:
-    description: Allows you to set your region to sell mode for selling to other players
-    default: true
-  areashop.resellall:
-    description: Allows you to set any region into selling mode
-    default: op
-  areashop.stopresell:
-    description: Allows you to set your region into normal mode if it is in sell mode
-    default: true
-  areashop.stopresellall:
-    description: Allows you to set any region into normal mode if it is in sell mode
-    default: op
-  areashop.addfriend:
-    description: Allows you to add friends to your regions
-    default: true
-  areashop.addfriendall:
-    description: Allows you to add friends to all regions
-    default: op
-  areashop.delfriend:
-    description: Allows you to delete friends from your regions
-    default: true
-  areashop.delfriendall:
-    description: Allows you to delete friends from all regions
-    default: op
-  areashop.notifyupdate:
-    description: Will notify this player when an update is available
-    default: op
-  areashop.linksigns:
-    description: Allows you to enter sign linking mode
-    default: op
-  areashop.stack:
-    description: Allows you to create regions and add them to AreaShop like the WorldEdit //stack command
-    default: op
-  areashop.setlandlord:
-    description: Allows you to set the landlord of a region, the landlord receives all revenue
-    default: op
-  areashop.message:
-    description: Allows you to send AreaShop messages to players
-    default: op
-  areashop.import:
-    description: Allows importing regions from other plugins
-    default: op
+name: AreaShop
+main: me.wiefferink.areashop.AreaShop
+version: "${project.version}${build.number}"
+description: "Selling and renting WorldGuard regions to your players, highly configurable."
+depend: [Vault, WorldGuard, WorldEdit]
+softdepend: [Multiverse-Core, FastAsyncWorldEdit]
+author: NLThijs48
+website: https://github.com/NLthijs48/AreaShop
+commands:
+  AreaShop:
+    description: 'For all commands use /as help.'
+    usage: 'AreaShop has not started correctly, check the log file (or console) and correct any errors.'
+    aliases: [as]
+  test:
+
+awareness:
+  - !@UTF8
+api-version: 1.13
+
+permissions:
+  areashop.*:
+    description: Give access to all commands of AreaShop
+    children:
+      areashop.help: true
+      areashop.createrent: true
+      areashop.createbuy: true
+      areashop.destroyrent: true
+      areashop.destroybuy: true
+      areashop.rent: true
+      areashop.buy: true
+      areashop.buyresell: true
+      areashop.buynormal: true
+      areashop.unrent: true
+      areashop.info: true
+      areashop.reload: true
+      areashop.setrestore: true
+      areashop.setprice: true
+      areashop.setduration: true
+      areashop.teleport: true
+      areashop.teleportall: true
+      areashop.setteleportall: true
+      areashop.teleportsign: true
+      areashop.teleportsignall: true
+      areashop.tabcomplete: true
+      areashop.setteleportoutsideregion: true
+      areashop.find: true
+      areashop.groupadd: true
+      areashop.groupdel: true
+      areashop.grouplist: true
+      areashop.groupinfo: true
+      areashop.limitbypass: true
+      areashop.schematicevents: true
+      areashop.addsign: true
+      areashop.delsign: true
+      areashop.renttimebypass: true
+      areashop.me: true
+      areashop.resellall: true
+      areashop.stopresellall: true
+      areashop.addfriendall: true
+      areashop.delfriendall: true
+      areashop.notifyupdate: true
+      areashop.stack: true
+      areashop.setlandlord: true
+      areashop.linksigns: true
+      areashop.message: true
+      areashop.import: true
+  areashop.landlord.*:
+    description: Give access to all landlord features
+    children:
+      areashop.createrent.owner: true
+      areashop.createbuy.owner: true
+      areashop.setprice.landlord: true
+      areashop.setduration.landlord: true
+      areashop.destroyrent.landlord: true
+      areashop.destroybuy.landlord: true
+  areashop.help:
+    description: Allows you to see the help pages
+    default: true
+  areashop.rent:
+    description: Allows you to rent a region
+    default: true
+  areashop.buy:
+    description: Allows you to buy a region
+    default: true
+  areashop.buyresell:
+    description: Allows you to buy a region that is in resell mode
+    default: true
+  areashop.buynormal:
+    description: Allows you to buy a region that is not in resell mode
+    default: true
+  areashop.unrent:
+    description: Allows you to unrent a specific region
+    default: op
+  areashop.unrentown:
+    description: Allows you to unrent your own region
+    default: true
+  areashop.sell:
+    description: Allows you to sell a specific region
+    default: op
+  areashop.sellown:
+    description: Allows you to sell your own region
+    default: true
+  areashop.createrent:
+    description: Allows you to add rent regions to AreaShop
+    default: op
+  areashop.createrent.member:
+    description: Allows you to add rent regions to AreaShop for which you are registered as member
+    default: false
+  areashop.createrent.owner:
+    description: Allows you to add rent regions to AreaShop for which you are registered as owner
+    default: false
+  areashop.createbuy:
+    description: Allows you to add buy regions to AreaShop
+    default: op
+  areashop.createbuy.member:
+    description: Allows you to add buy regions to AreaShop for which you are registered as member
+    default: false
+  areashop.createbuy.owner:
+    description: Allows you to add buy regions to AreaShop for which you are registered as owner
+    default: false
+  areashop.destroyrent:
+    description: Allows you remove rental regions from AreaShop
+    default: op
+  areashop.destroyrent.landlord:
+    description: Allows you to remove rental regions from AreaShop when you are the landlord
+    default: false
+  areashop.destroybuy:
+    description: Allows you to remove buy regions from AreaShop
+    default: op
+  areashop.destroybuy.landlord:
+    description: Allows you to remove buy regions from AreaShop when you are the landlord
+    default: false
+  areashop.info:
+    description: Allows you check the status of regions and players
+    default: true
+  areashop.reload:
+    description: Allows you to reload the config and update all region flags and signs
+    default: op
+  areashop.setrestore:
+    description: Allows you to change the restore settings
+    default: op
+  areashop.setprice:
+    description: Allows you to change the price
+    default: op
+  areashop.setprice.landlord:
+    description: Allows you to change the price of a region that you are landlord of
+    default: false
+  areashop.setduration:
+    description: Allows you to change the duration of a rent
+    default: op
+  areashop.setduration.landlord:
+    description: Allows you to change the duration of a region that you are landlord of
+    default: false
+  areashop.teleport:
+    description: Teleport to your region
+    default: true
+  areashop.teleportall:
+    description: Teleport to all regions
+    default: op
+  areashop.teleportsign:
+    description: Teleport to signs of regions you own
+    default: true
+  areashop.teleportsignall:
+    description: Teleport to signs of all regions
+    default: op
+  areashop.teleportfriend:
+    description: Teleport to regions where you are added as friend
+    default: true
+  areashop.teleportfriendsign:
+    description: Teleport to the sign of regions where you are added as friend
+    default: true
+  areashop.teleportavailable:
+    description: Teleport to regions which are available
+    default: true
+  areashop.teleportavailablesign:
+    description: Teleport to the sign of regions which are available
+    default: true
+  areashop.setteleport:
+    description: Set the teleport spot for your region
+    default: true
+  areashop.setteleportall:
+    description: Set the teleport for other regions
+    default: op
+  areashop.setteleportoutsideregion:
+    description: Set the teleport location outside the WorldGuard region
+    default: op
+  areashop.tabcomplete:
+    description: Allows you to tabcomplete all commands (also where you dont have permission)
+    default: op
+  areashop.find:
+    description: Allows you to teleport to a free region (/as find)
+    default: true
+  areashop.groupadd:
+    description: Allows you to add regions to groups
+    default: op
+  areashop.groupdel:
+    description: Allows you to delete regions from groups
+    default: op
+  areashop.grouplist:
+    description: Allows you to list all the groups currently created
+    default: op
+  areashop.groupinfo:
+    description: Allows you to display information about a group (all members)
+    default: op
+  areashop.rentextendbypass:
+    description: Bypass the extend limit on rents
+    default: op
+  areashop.limits.default:
+    description: Assign limits as set in the 'default' group in the 'limitGroups' section of the config
+    default: true
+  areashop.limitbypass:
+    description: Bypass the limits for renting/buying regions (how many you can have at the same time)
+    default: op
+  areashop.schematicevents:
+    description: Allows you to trigger schematic events for regions
+    default: op
+  areashop.addsign:
+    description: Allows you to add signs to existing regions
+    default: op
+  areashop.delsign:
+    description: Allows you to delete signs from existing regions
+    default: op
+  areashop.renttimebypass:
+    description: Bypass the maximum rent time you can have in advance
+    default: op
+  areashop.me:
+    description: Allows you to get information about your regions
+    default: true
+  areashop.setownerrent:
+    description: Allows you to set the owner of rent regions
+    default: op
+  areashop.setownerbuy:
+    description: Allows you to set the owner of buy regions
+    default: op
+  areashop.resell:
+    description: Allows you to set your region to sell mode for selling to other players
+    default: true
+  areashop.resellall:
+    description: Allows you to set any region into selling mode
+    default: op
+  areashop.stopresell:
+    description: Allows you to set your region into normal mode if it is in sell mode
+    default: true
+  areashop.stopresellall:
+    description: Allows you to set any region into normal mode if it is in sell mode
+    default: op
+  areashop.addfriend:
+    description: Allows you to add friends to your regions
+    default: true
+  areashop.addfriendall:
+    description: Allows you to add friends to all regions
+    default: op
+  areashop.delfriend:
+    description: Allows you to delete friends from your regions
+    default: true
+  areashop.delfriendall:
+    description: Allows you to delete friends from all regions
+    default: op
+  areashop.notifyupdate:
+    description: Will notify this player when an update is available
+    default: op
+  areashop.linksigns:
+    description: Allows you to enter sign linking mode
+    default: op
+  areashop.stack:
+    description: Allows you to create regions and add them to AreaShop like the WorldEdit //stack command
+    default: op
+  areashop.setlandlord:
+    description: Allows you to set the landlord of a region, the landlord receives all revenue
+    default: op
+  areashop.message:
+    description: Allows you to send AreaShop messages to players
+    default: op
+  areashop.import:
+    description: Allows importing regions from other plugins
+    default: op

hooks/areashop-fawe-1-15/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>areashop-fawe-1-15</artifactId>
     <packaging>jar</packaging>
-    <name>AreaShop FastAsyncWorldEdit 1.15+</name>
+    <name>AreaShop FastAsyncWorldEdit 1.14+</name>
     <version>latest</version>
 
     <parent>
@@ -24,21 +24,21 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
-            <type>jar</type>
+            <version>1.14.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
+
         <dependency>
             <groupId>com.intellectualsites.fawe</groupId>
             <artifactId>FAWE-Bukkit</artifactId>
-            <version>1.16-380</version> <!-- Equivalent to WE 7.0.2? -->
+            <version>1.16-313</version> <!-- Equivalent to WE 7.0.2? -->
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-          <version>7.0.3</version>
+            <version>7.0.3</version>
             <scope>provided</scope>
         </dependency>
 
@@ -46,7 +46,7 @@
             <groupId>me.wiefferink</groupId>
             <artifactId>areashop-interface</artifactId>
             <version>latest</version>
-            <type>jar</type>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>

hooks/areashop-fawe-1-15/src/main/java/me/wiefferink/areashop/handlers/fawe/v1_15/FastAsyncWorldEditHandler.java

@@ -2,7 +2,6 @@ package me.wiefferink.areashop.handlers.fawe.v1_15;
 
 import com.boydti.fawe.FaweAPI;
 import com.boydti.fawe.object.FaweLimit;
-import com.boydti.fawe.object.RelightMode;
 import com.sk89q.jnbt.NBTInputStream;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.IncompleteRegionException;
@@ -42,25 +41,6 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
         super(pluginInterface);
     }
 
-    private Mask newMask(final ProtectedRegion region) {
-        return new Mask() {
-            @Override
-            public boolean test(BlockVector3 vector) {
-                return region.contains(vector);
-            }
-
-            @Override
-            public Mask2D toMask2D() {
-                return null;
-            }
-
-            @Override
-            public Mask copy() {
-                return this;
-            }
-        };
-    }
-
     @Override
     public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
         // TODO implement using the FastAsyncWorldEdit api to paste async
@@ -77,11 +57,11 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
         }
         if (file == null) {
             pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName()
-                + ", schematic file does not exist: " + rawFile.getAbsolutePath());
+                    + ", 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());
+                file.getAbsolutePath(), "with format", format.getName());
 
         com.sk89q.worldedit.world.World world = null;
         if (regionInterface.getName() != null) {
@@ -89,8 +69,8 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
         }
         if (world == null) {
             pluginInterface.getLogger().info(
-                "Did not restore region " + regionInterface.getName() + ", world not found: "
-                    + regionInterface.getWorldName());
+                    "Did not restore region " + regionInterface.getName() + ", world not found: "
+                            + regionInterface.getWorldName());
             return false;
         }
         final FaweLimit limit = new FaweLimit();
@@ -105,10 +85,11 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
 
 
         // 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));
-             NBTInputStream nbtStream = new NBTInputStream(new GZIPInputStream(bis));
-             ClipboardReader reader = new FastSchematicReader(nbtStream)) {
+        try (Closer closer = Closer.create()) {
+            FileInputStream fis = closer.register(new FileInputStream(file));
+            BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
+            NBTInputStream nbtStream = new NBTInputStream(new GZIPInputStream(bis));
+            ClipboardReader reader = new FastSchematicReader(nbtStream);
 
             LocalSession session =
                     new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
@@ -134,30 +115,40 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
 
             BlockTransformExtent extent = new BlockTransformExtent(clipboard);
             ForwardExtentCopy copy =
-                new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(),
-                    editSession, origin);
+                    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(newMask(region));
-                }
+            if (region.getType() != RegionType.CUBOID) {
+                copy.setSourceMask(new Mask() {
+                    @Override
+                    public boolean test(BlockVector3 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"));
+                    "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");
+                    "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());
+                    .warning("crashed during restore of " + regionInterface.getName());
             pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
             return false;
         }
@@ -165,14 +156,15 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
         return true;
     }
 
-    @Override public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+    @Override
+    public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
         // TODO implement using the FastAsyncWorldEdit api to save async
         ClipboardFormat format = BuiltInClipboardFormat.MINECRAFT_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.getPrimaryFileExtension());
         pluginInterface.debugI("Trying to save region", regionInterface.getName(), " to file",
-            file.getAbsolutePath(), "with format", format.getName());
+                file.getAbsolutePath(), "with format", format.getName());
         com.sk89q.worldedit.world.World world = null;
         if (regionInterface.getWorld() != null) {
             world = BukkitAdapter.adapt(regionInterface.getWorld());
@@ -183,9 +175,9 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
                             + regionInterface.getWorldName());
             return false;
         }
-        final FaweLimit limit = new FaweLimit();
-        limit.MAX_CHANGES = pluginInterface.getConfig().getInt("maximumBlocks");
-        EditSession editSession = FaweAPI.getEditSessionBuilder(world).limit(limit).relightMode(RelightMode.OPTIMAL).build();
+        EditSession editSession =
+                pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory()
+                        .getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
 
         // Create a clipboard
         CuboidRegion selection =
@@ -207,34 +199,34 @@ public class FastAsyncWorldEditHandler extends WorldEditInterface {
             return false;
         }
 
-        try (Closer closer = Closer.create();
-             FileOutputStream fos = closer.register(new FileOutputStream(file));
-             BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos))) {
-
+        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()
+                    "An error occurred 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());
+                    .warning("Crashed during save of " + regionInterface.getName());
             pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
             return false;
         }
         return true;
     }
 
-    @Override public WorldEditSelection getPlayerSelection(Player player) {
+    @Override
+    public WorldEditSelection getPlayerSelection(Player player) {
         try {
             Region region = pluginInterface.getWorldEdit().getSession(player)
-                .getSelection(BukkitAdapter.adapt(player.getWorld()));
+                    .getSelection(BukkitAdapter.adapt(player.getWorld()));
             return new WorldEditSelection(player.getWorld(),
-                BukkitAdapter.adapt(player.getWorld(), region.getMinimumPoint()),
-                BukkitAdapter.adapt(player.getWorld(), region.getMaximumPoint()));
+                    BukkitAdapter.adapt(player.getWorld(), region.getMinimumPoint()),
+                    BukkitAdapter.adapt(player.getWorld(), region.getMaximumPoint()));
         } catch (IncompleteRegionException e) {
             return null;
         }

hooks/areashop-interface/pom.xml

@@ -27,6 +27,7 @@
             <version>7.1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>

hooks/areashop-worldedit-7/pom.xml

@@ -35,6 +35,7 @@
             <version>7.0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>

hooks/areashop-worldedit-7/src/main/java/me/wiefferink/areashop/handlers/worldedit/v7/WorldEditHandler.java

@@ -46,14 +46,7 @@ public class WorldEditHandler extends WorldEditInterface {
 	@Override
 	public WorldEditSelection getPlayerSelection(Player player) {
 		try {
-			final LocalSession session = pluginInterface.getWorldEdit().getSession(player);
-			if (session == null) {
-				return null;
-			}
-			Region region = session.getSelection(BukkitAdapter.adapt(player.getWorld()));
-			if (region == null) {
-				return null;
-			}
+			Region region = pluginInterface.getWorldEdit().getSession(player).getSelection(BukkitAdapter.adapt(player.getWorld()));
 			return new WorldEditSelection(
 					player.getWorld(),
 					BukkitAdapter.adapt(player.getWorld(), region.getMinimumPoint()),
@@ -99,10 +92,10 @@ public class WorldEditHandler extends WorldEditInterface {
 		BlockVector3 origin = BlockVector3.at(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
 
 		// Read the schematic and paste it into the world
-		try(Closer closer = Closer.create();
+		try(Closer closer = Closer.create()) {
 			FileInputStream fis = closer.register(new FileInputStream(file));
 			BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
-			ClipboardReader reader = format.getReader(bis)) {
+			ClipboardReader reader = format.getReader(bis);
 
 			//WorldData worldData = world.getWorldData();
 			LocalSession session = new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
@@ -195,9 +188,10 @@ public class WorldEditHandler extends WorldEditInterface {
 			return false;
 		}
 
-		try(Closer closer = Closer.create(); FileOutputStream fos = closer.register(new FileOutputStream(file));
+		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));) {
+			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");

hooks/areashop-worldguard-7/pom.xml

@@ -14,20 +14,19 @@
     </parent>
 
     <dependencies>
+
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
             <version>1.13.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
-            <type>jar</type>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <scope>provided</scope>
             <version>7.2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
@@ -40,7 +39,6 @@
             <groupId>me.wiefferink</groupId>
             <artifactId>areashop-interface</artifactId>
             <version>latest</version>
-            <type>jar</type>
         </dependency>
     </dependencies>
 

pom.xml

@@ -1,116 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>me.wiefferink</groupId>
-  <artifactId>areashop-parent</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0</version>
-  <name>AreaShop Parent</name>
-  <url>https://github.com/NLthijs48/AreaShop</url>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>me.wiefferink</groupId>
+    <artifactId>areashop-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0</version>
+    <name>AreaShop Parent</name>
+    <url>https://github.com/NLthijs48/AreaShop</url>
 
-  <licenses>
-    <license>
-      <name>GNU General Public License v3.0</name>
-      <url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+    <licenses>
+        <license>
+            <name>GNU General Public License v3.0</name>
+            <url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
-  <issueManagement>
-    <url>https://github.com/NLthijs48/AreaShop/issues</url>
-    <system>GitHub Issues</system>
-  </issueManagement>
+    <issueManagement>
+        <url>https://github.com/md5sha256/AreaShop/issues</url>
+        <system>GitHub Issues</system>
+    </issueManagement>
 
-  <ciManagement>
-    <system>Jenkins</system>
-    <url>http://jenkins.wiefferink.me/job/AreaShop</url>
-  </ciManagement>
+    <!--ciManagement>
+        <system>Jenkins</system>
+        <url>http://jenkins.wiefferink.me/job/AreaShop</url>
+    </ciManagement-->
 
-  <repositories>
-    <repository>
-      <id>vault-repo</id>
-      <url>http://nexus.hc.to/content/repositories/pub_releases</url>
-    </repository>
-    <repository>
-      <id>wiefferink-repo</id>
-      <url>http://maven.wiefferink.me</url>
-    </repository>
-    <repository>
-      <id>bstats-repo</id>
-      <url>http://repo.bstats.org/content/repositories/releases/</url>
-    </repository>
-    <repository>
-      <id>mvn-repo</id>
-      <url>https://mvnrepository.com/artifact/org.bstats/bstats-bukkit</url>
-    </repository>
-      <repository>
-        <id>sk89q-repo</id>
-        <url>https://maven.enginehub.org/repo/</url>
-      </repository>
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-    </repository>
-  </repositories>
+    <repositories>
+        <repository>
+            <id>vault-repo</id>
+            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+        </repository>
+        <repository>
+            <id>wiefferink-repo</id>
+            <url>http://maven.wiefferink.me</url>
+        </repository>
+        <repository>
+            <id>bstats-repo</id>
+            <url>http://repo.bstats.org/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>mvn-repo</id>
+            <url>https://mvnrepository.com/artifact/org.bstats/bstats-bukkit</url>
+        </repository>
+        <repository>
+            <id>sk89q-repo</id>
+            <url>https://maven.enginehub.org/repo/</url>
+        </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <!--build.number>#CUSTOM</build.number-->
-  </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <!--build.number>#CUSTOM</build.number-->
+    </properties>
 
-  <modules>
-    <module>hooks/areashop-interface</module>
+    <modules>
+        <module>hooks/areashop-interface</module>
 
-    <!-- FAWE Compat -->
-    <module>hooks/areashop-fawe-1-15</module>
+        <!-- FAWE Compat -->
+        <module>hooks/areashop-fawe-1-15</module>
 
-    <!-- World Edit Compat -->
-    <module>hooks/areashop-worldedit-7</module>
+        <!-- World Edit Compat -->
+        <module>hooks/areashop-worldedit-7</module>
 
 
-    <!-- World Guard Compat -->
-    <module>hooks/areashop-worldguard-7</module>
+        <!-- World Guard Compat -->
+        <module>hooks/areashop-worldguard-7</module>
 
-    <module>AreaShop</module>
-  </modules>
+        <module>AreaShop</module>
+    </modules>
 
-  <build>
-    <defaultGoal>clean package</defaultGoal>
-    <!--plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.1.0</version>
-        <dependencies>
-          <dependency>
-            <groupId>com.puppycrawl.tools</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>8.29</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <id>validate</id>
-            <phase>validate</phase>
-            <configuration>
-              <configLocation>config/checkstyle.xml</configLocation>
-              <suppressionsLocation>config/checkstyle-suppressions.xml</suppressionsLocation>
-              <suppressionsFileExpression>config/checkstyle.suppressions.file
-              </suppressionsFileExpression>
-              <encoding>UTF-8</encoding>
-              <consoleOutput>true</consoleOutput>
-              <failsOnError>true</failsOnError>
-              <violationSeverity>error</violationSeverity>
-            </configuration>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins-->
-  </build>
+    <build>
+        <defaultGoal>clean package</defaultGoal>
+    </build>
 
 </project>