Fixed an issue not taking into account Player sell limits (Reported by andrewfb)

Reorganised code for clearing display entities

Signed-off-by: petulikan1 <petulikan@gmail.com>

Took 1 hour 52 minutes

Author: petulikan1

Core/src/main/java/xzot1k/plugins/ds/DisplayShops.java

@@ -16,6 +16,8 @@
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.Recipe;
@@ -138,9 +140,8 @@ public void onEnable() {
 
         fixConfig();
 
-        if (getDisplayManager() != null) {
-            Display.ClearAllEntities();
-        }
+        ClearAllEntities();
+
 
         menuMap = new HashMap<>();
         shopMemory = new HashMap<>();
@@ -255,11 +256,37 @@ else if (isOutdated())
                     + getLatestVersion() + "'. You are currently running '" + getDescription().getVersion() + "'.");
     }
 
+    public static void ClearAllEntities() {
+        for (World world : DisplayShops.getPluginInstance().getServer().getWorlds()) {
+            for (Entity entity : world.getEntities()) {
+                if ((entity.getType() == EntityType.ARMOR_STAND || entity.getType() == EntityType.ITEM_FRAME || entity.getType().name().endsWith("_DISPLAY"))
+                        && (entity.hasMetadata("DisplayShops-Entity") || entity.getPersistentDataContainer().has(Display.key))) {
+                    entity.remove();
+                }
+            }
+        }
+        if(getPluginInstance().getDisplayManager()==null)
+            return;
+
+        for (Map.Entry<UUID, Display> entry : DisplayShops.getPluginInstance().getDisplayManager().getShopDisplays().entrySet()) {
+            Display display = entry.getValue();
+            if (display.getItemHolder() != null) {display.getItemHolder().remove();}
+            if (display.getGlass() != null) {display.getGlass().remove();}
+            if (display.getTextDisplay() != null) {display.getTextDisplay().remove();}
+
+            World world = DisplayShops.getPluginInstance().getServer().getWorld(display.getShop().getBaseLocation().getWorldName());
+            if (world != null) {
+                world.getEntities().stream().filter(entity -> display.getEntityIds().contains(entity.getUniqueId())).forEach(Entity::remove);
+            }
+        }
+    }
+
     @Override
     public void onDisable() {
         getServer().getScheduler().cancelTasks(this);
 
-        if (getDisplayManager() != null) {Display.ClearAllEntities();}
+        ClearAllEntities();
+
 
         if (getManager() != null) {
             final int[] shopSaveCount = {0};

Core/src/main/java/xzot1k/plugins/ds/core/Commands.java

@@ -1466,7 +1466,7 @@ private void runCleanUp(CommandSender commandSender) {
         if (DisplayShops.getPluginInstance().getDisplayManager() != null) {
             DisplayShops.getPluginInstance().getInSightTask().setPaused(true);
 
-            Display.ClearAllEntities();
+            DisplayShops.ClearAllEntities();
 
             for (Map.Entry<UUID, Display> entry : new ArrayList<>(DisplayShops.getPluginInstance().getDisplayManager().getShopDisplays().entrySet())) {
                 entry.getValue().delete();
@@ -1843,7 +1843,7 @@ private void runReload(CommandSender commandSender) {
 
         // clear displays
         if (getPluginInstance().getDisplayManager() != null) {
-            Display.ClearAllEntities();
+            DisplayShops.ClearAllEntities();
 
             for (Map.Entry<UUID, Display> entry : new ArrayList<>(DisplayShops.getPluginInstance().getDisplayManager().getShopDisplays().entrySet())) {
                 entry.getValue().delete();

Core/src/main/java/xzot1k/plugins/ds/core/gui/MenuListener.java

@@ -908,8 +908,8 @@ private void operateTransactionMenu(InventoryClickEvent e, Inventory inventory,
                     }
 
                     sellableUnits = Math.min(sellableUnits, ((int) remainingLimit));
-                } else if (shop.getGlobalSellLimit() > 0) {
-                    long remainingLimit = dataPack.getCurrentTransactionCounter(shop, false);
+                } else if (shop.getPlayerBuyLimit() > 0) {
+                    long remainingLimit = shop.getPlayerSellLimit()-dataPack.getCurrentTransactionCounter(shop, false);
                     if (remainingLimit <= 0) {
                         player.closeInventory();
                         INSTANCE.getManager().sendMessage(player, INSTANCE.getLangConfig().getString("sell-limit-exceeded"));

Core/src/main/java/xzot1k/plugins/ds/core/packets/Display.java

@@ -3,7 +3,10 @@
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.*;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.ItemDisplay;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.TextDisplay;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.FixedMetadataValue;
@@ -14,7 +17,10 @@
 import xzot1k.plugins.ds.DisplayShops;
 import xzot1k.plugins.ds.api.objects.Shop;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
 
 public class Display {
 
@@ -31,29 +37,6 @@ public Display(@NotNull Shop shop) {
         this.shop = shop;
     }
 
-    public static void ClearAllEntities() {
-        for (World world : DisplayShops.getPluginInstance().getServer().getWorlds()) {
-            for (Entity entity : world.getEntities()) {
-                if ((entity.getType() == EntityType.ARMOR_STAND || entity.getType() == EntityType.ITEM_FRAME || entity.getType().name().endsWith("_DISPLAY"))
-                        && (entity.hasMetadata("DisplayShops-Entity") || entity.getPersistentDataContainer().has(key))) {
-                    entity.remove();
-                }
-            }
-        }
-
-        for (Map.Entry<UUID, Display> entry : DisplayShops.getPluginInstance().getDisplayManager().getShopDisplays().entrySet()) {
-            Display display = entry.getValue();
-            if (display.getItemHolder() != null) {display.getItemHolder().remove();}
-            if (display.getGlass() != null) {display.getGlass().remove();}
-            if (display.getTextDisplay() != null) {display.getTextDisplay().remove();}
-
-            World world = DisplayShops.getPluginInstance().getServer().getWorld(display.getShop().getBaseLocation().getWorldName());
-            if (world != null) {
-                world.getEntities().stream().filter(entity -> display.getEntityIds().contains(entity.getUniqueId())).forEach(Entity::remove);
-            }
-        }
-    }
-
     public void Clear() {
         World world = DisplayShops.getPluginInstance().getServer().getWorld(shop.getBaseLocation().getWorldName());