From 0726fde530ef9b68b1763de40a7b7079b01235aa Mon Sep 17 00:00:00 2001
From: Steven <St3venAU@gmail.com>
Date: Thu, 23 May 2024 22:44:18 +0800
Subject: [PATCH] v4.4.6 Fix bug where tools are kept when returning inventory
 in 1.20.6

---
 pom.xml                                       |  2 +-
 .../St3venAU/plugins/ArmorStandTools/AST.java | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index adb6486..9f64c55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.gmail.st3venau.plugins</groupId>
 <artifactId>ArmorStandTools</artifactId>
-<version>4.4.5</version>
+<version>4.4.6</version>
 <name>ArmorStandTools</name>
 
 <repositories>
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/AST.java b/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/AST.java
index 45ec580..df46618 100644
--- a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/AST.java
+++ b/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/AST.java
@@ -26,6 +26,7 @@ import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.AbstractMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
@@ -117,7 +118,6 @@ public class AST extends JavaPlugin {
         waitingForName.clear();
         waitingForSkull.clear();
     }
-
     static void returnArmorStand(ArmorStand as) {
         if(as == null) return;
         if(as.hasMetadata("clone")) {
@@ -139,19 +139,31 @@ public class AST extends JavaPlugin {
         as.remove();
     }
 
+    private static boolean matches(ItemStack one, ItemStack two) {
+        if(one == null || two == null || one.getItemMeta() == null || two.getItemMeta() == null) return false;
+        String NameOne = one.getItemMeta().getDisplayName();
+        List<String> LoreOne = one.getItemMeta().getLore();
+        if(LoreOne == null) return false;
+        String NameTwo = two.getItemMeta().getDisplayName();
+        List<String> LoreTwo = two.getItemMeta().getLore();
+        if(LoreTwo == null) return false;
+        return NameOne.equals(NameTwo) && LoreOne.equals(LoreTwo);
+    }
     private static void removeAllTools(Player p) {
         PlayerInventory i = p.getInventory();
         for(ArmorStandTool t : ArmorStandTool.values()) {
-            i.remove(t.getItem());
+            for(int slot = 0; slot < i.getSize(); slot++) {
+                if(matches(t.getItem(), i.getItem(slot))) {
+                    i.setItem(slot, null);
+                }
+            }
         }
     }
-
     void saveInventoryAndClear(Player p) {
         ItemStack[] inv = p.getInventory().getContents().clone();
         savedInventories.put(p.getUniqueId(), inv);
         p.getInventory().clear();
     }
-
     static void restoreInventory(Player p) {
         removeAllTools(p);
         UUID uuid = p.getUniqueId();