Bump version

AreaShop/build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 description = 'AreaShop'
-version = '2.6.3'
+version = '2.6.4'
 
 dependencies {
     // Spigot api

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

@@ -152,17 +152,17 @@ public class SignsFeature extends RegionFeature {
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onSignBreak(BlockBreakEvent event) {
-        if (getRegion().invalidated()) {
+        Block block = event.getBlock();
+        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+        if (regionSign == null) {
+            return;
+        }
+        if (regionSign.getRegion().invalidated()) {
             AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
         }
-        Block block = event.getBlock();
         // Check if it is a sign
         if (Materials.isSign(block.getType())) {
             // Check if the rent sign is really the same as a saved rent
-            RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-            if (regionSign == null) {
-                return;
-            }
             if (regionSign.getRegion().invalidated()) {
                 AreaShop.warn("SignsFeature: Sign feature for an invalidated region object is still active!");
             }
@@ -179,13 +179,6 @@ public class SignsFeature extends RegionFeature {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onIndirectSignBreak(BlockPhysicsEvent event) {
-        if (getRegion().invalidated()) {
-            AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
-        }
-        // Check if the block is a sign
-        if (!Materials.isSign(event.getBlock().getType())) {
-            return;
-        }
         final Block block = event.getBlock();
 
         // Check if the sign is really the same as a saved rent
@@ -193,6 +186,14 @@ public class SignsFeature extends RegionFeature {
         if (regionSign == null) {
             return;
         }
+
+        if (regionSign.getRegion().invalidated()) {
+            AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
+        }
+        // Check if the block is a sign
+        if (!Materials.isSign(event.getBlock().getType())) {
+            return;
+        }
         // If the block is in an invalid position then we remove the sign
         if (!behaviourHelper.isBlockValid(block)) {
             regionSign.remove();
@@ -206,13 +207,19 @@ public class SignsFeature extends RegionFeature {
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onSignClick(PlayerInteractEvent event) {
-        if (getRegion().invalidated()) {
-            AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
-        }
         Block block = event.getClickedBlock();
         if (block == null) {
             return;
         }
+        // Check if this sign belongs to a region
+        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+        if (regionSign == null) {
+            return;
+        }
+
+        if (regionSign.getRegion().invalidated()) {
+            AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
+        }
 
         // Only listen to left and right clicks on blocks
         if (!(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)) {
@@ -224,11 +231,6 @@ public class SignsFeature extends RegionFeature {
             return;
         }
 
-        // Check if this sign belongs to a region
-        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-        if (regionSign == null) {
-            return;
-        }
 
         // Ignore players that are in sign link mode (which will handle the event itself)
         Player player = event.getPlayer();
@@ -256,7 +258,13 @@ public class SignsFeature extends RegionFeature {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onSignChange(SignChangeEvent event) {
-        if (getRegion().invalidated()) {
+
+        RegionSign regionSign = SignsFeature.getSignByLocation(event.getBlock().getLocation());
+        if (regionSign == null) {
+            return;
+        }
+
+        if (regionSign.getRegion().invalidated()) {
             AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
         }
         Player player = event.getPlayer();

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

@@ -120,7 +120,7 @@ public class GithubUpdateCheck {
                                         error = true;
                                         return;
                                     }
-                                    debug("json: " + latestRelease.getAsString());
+                                    debug("json: " + latestRelease.toString());
 
                                     // Latest version
                                     latestVersion = latestRelease.get("tag_name").getAsString();

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "me.wiefferink.areashop"
-version = '2.6.3'
+version = '2.6.4'
 
 subprojects {
 

hooks/areashop-fawe-1-17/build.gradle

@@ -7,9 +7,9 @@ repositories {
 
 dependencies {
     compileOnly project(':areashop-interface')
-    compileOnly('org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT')
-    compileOnly("com.fastasyncworldedit:FAWE-Core:1.17-5")
-    compileOnly("com.fastasyncworldedit:FAWE-Bukkit:1.17-5")
+    compileOnly('org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT')
+    compileOnly("com.fastasyncworldedit:FAWE-Core:1.17-138")
+    compileOnly("com.fastasyncworldedit:FAWE-Bukkit:1.17-138")
     compileOnly('com.sk89q.worldguard:worldguard-bukkit:7.0.5')
 }
 

hooks/areashop-fawe-1-17/src/main/java/me/wiefferink/areashop/handlers/fawe/v1_17/FastAsyncWorldEditHandler.java

@@ -1,9 +1,10 @@
 package me.wiefferink.areashop.handlers.fawe.v1_17;
 
 import com.fastasyncworldedit.core.FaweAPI;
+import com.fastasyncworldedit.core.extent.clipboard.MemoryOptimizedClipboard;
+import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReader;
+import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
 import com.fastasyncworldedit.core.object.FaweLimit;
-import com.fastasyncworldedit.core.object.RelightMode;
-import com.fastasyncworldedit.core.object.clipboard.MemoryOptimizedClipboard;
 import com.fastasyncworldedit.core.util.EditSessionBuilder;
 import com.google.common.annotations.Beta;
 import com.sk89q.jnbt.NBTInputStream;

hooks/areashop-nms-1-17/build.gradle

@@ -4,5 +4,5 @@ repositories {
 
 dependencies {
     compileOnly project(':areashop-interface')
-    compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT'
 }