Merge remote-tracking branch 'origin/master'

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -46,9 +46,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.api.QuickShopAPI;
-//import org.maxgamer.quickshop.chat.QuickChat;
-//import org.maxgamer.quickshop.chat.QuickChatType;
-//import org.maxgamer.quickshop.chat.platform.minedown.AdventureQuickChat;
 import org.maxgamer.quickshop.command.CommandManager;
 import org.maxgamer.quickshop.database.*;
 import org.maxgamer.quickshop.economy.*;
@@ -1908,6 +1905,10 @@ private void updateConfig(int selectedVersion) throws IOException {
             getConfig().set("integration.iridiumskyblock.owner-create-only", false);
             getConfig().set("config-version", ++selectedVersion);
         }
+        if (selectedVersion == 140) {
+            getConfig().set("integration.towny.delete-shop-on-plot-destroy", true);
+            getConfig().set("config-version", ++selectedVersion);
+        }
 
         if (getConfig().getInt("matcher.work-type") != 0 && GameVersion.get(ReflectFactory.getServerVersion()).name().contains("1_16")) {
             getLogger().warning("You are not using QS Matcher, it may meeting item comparing issue mentioned there: https://hub.spigotmc.org/jira/browse/SPIGOT-5063");

src/main/java/org/maxgamer/quickshop/integration/towny/TownyIntegration.java

@@ -22,6 +22,7 @@
 import com.palmergames.bukkit.towny.TownyAPI;
 import com.palmergames.bukkit.towny.event.PlotClearEvent;
 import com.palmergames.bukkit.towny.event.TownRemoveResidentEvent;
+import com.palmergames.bukkit.towny.event.actions.TownyDestroyEvent;
 import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
 import com.palmergames.bukkit.towny.object.Town;
 import com.palmergames.bukkit.towny.object.TownBlock;
@@ -61,6 +62,7 @@ public class TownyIntegration extends QSIntegratedPlugin implements Listener {
     private boolean deleteShopOnPlotClear;
     private boolean isNewVersion;
     private boolean whiteList;
+    private boolean deleteShopOnPlotDestroy;
 
 
     public TownyIntegration(QuickShop plugin) {
@@ -82,6 +84,7 @@ private void init() {
         ignoreDisabledWorlds = plugin.getConfig().getBoolean("integration.towny.ignore-disabled-worlds");
         deleteShopOnLeave = plugin.getConfig().getBoolean("integration.towny.delete-shop-on-resident-leave");
         deleteShopOnPlotClear = plugin.getConfig().getBoolean("integration.towny.delete-shop-on-plot-clear");
+        deleteShopOnPlotDestroy = plugin.getConfig().getBoolean("integration.towny.delete-shop-on-plot-destroy");
         whiteList = plugin.getConfig().getBoolean("integration.towny.whitelist-mode");
     }
 
@@ -134,7 +137,7 @@ public void deleteShops(UUID owner, Town town) {
     }
 
     public void purgeShops(TownBlock townBlock) {
-        if (!deleteShopOnPlotClear) {
+        if (townBlock == null) {
             return;
         }
         String worldName;
@@ -177,6 +180,21 @@ public void onPlayerLeave(TownRemoveResidentEvent event) {
 
     @EventHandler
     public void onPlotClear(PlotClearEvent event) {
+        if (!deleteShopOnPlotClear) {
+            return;
+        }
+        if (Bukkit.isPrimaryThread()) {
+            purgeShops(event.getTownBlock());
+        } else {
+            Util.mainThreadRun(() -> purgeShops(event.getTownBlock()));
+        }
+    }
+
+    @EventHandler
+    public void onPlotDestroy(TownyDestroyEvent event) {
+        if (!deleteShopOnPlotDestroy) {
+            return;
+        }
         if (Bukkit.isPrimaryThread()) {
             purgeShops(event.getTownBlock());
         } else {

src/main/resources/config.yml

@@ -22,7 +22,7 @@
 #                        TO EDIT QUICKSHOP'S CONFIGURATION, USE THE "config.yml" FILE!
 
 #Do not touch this if you don't know what you're doing!
-config-version: 140
+config-version: 141
 
 #Select the language you want to use, (e.g de), use only supported language codes from the list below.
 #If you use a not existant/not supported language, then QuickShop will use en_US.
@@ -597,6 +597,7 @@ integration:
     trade: [ ]
     delete-shop-on-resident-leave: false
     delete-shop-on-plot-clear: true
+    delete-shop-on-plot-destroy: true
     #Should we prevent the creation of a shop or trade with a shop outside Towny's area
     whitelist-mode: true
   #WorldGuard Integration