From d3789d98ebd2b143749619e86224957a96357215 Mon Sep 17 00:00:00 2001
From: Selena Rose Hammond <andregibby@gmail.com>
Date: Fri, 5 Jan 2024 22:14:52 +1300
Subject: [PATCH 1/3] Updated xseries to fully support 1.20 versions.

---
 pom.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 56d40de4d..04728b15a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>XSeries</artifactId>
-            <version>9.4.0</version>
+            <version>9.8.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -250,7 +250,7 @@
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>EssentialsX</artifactId>
-            <version>2.16.0</version>
+            <version>2.18.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -419,11 +419,6 @@
             <id>CodeMC</id>
             <url>https://repo.codemc.org/repository/maven-public</url>
         </repository>
-        <repository>
-            <id>codemc-repo</id>
-            <url>https://repo.codemc.org/repository/maven-public/</url>
-            <layout>default</layout>
-        </repository>
         <repository>
             <id>central</id>
             <name>bintray</name>

From 02276bd6984284a4a240f836114bb14f20530fb9 Mon Sep 17 00:00:00 2001
From: Selena Rose Hammond <selenarosehammond@gmail.com>
Date: Sat, 6 Jan 2024 09:37:49 +1300
Subject: [PATCH 2/3] Updated NBT Api to use the API not the plugin and updated
 the version

---
 pom.xml                                                     | 6 +++---
 .../com/massivecraft/factions/cmd/banner/CmdBanner.java     | 2 +-
 .../factions/cmd/banner/listener/BannerListener.java        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 04728b15a..9d8e5dca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
                             <shadedPattern>com.massivecraft.factions.shade.com.darkblade12</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>de.tr7zw</pattern>
+                            <pattern>de.tr7zw.changeme.nbtapi</pattern>
                             <shadedPattern>com.massivecraft.factions.shade.nbtapi</shadedPattern>
                         </relocation>
                     </relocations>
@@ -115,8 +115,8 @@
         </dependency>
         <dependency>
             <groupId>de.tr7zw</groupId>
-            <artifactId>item-nbt-api-plugin</artifactId>
-            <version>2.11.3</version>
+            <artifactId>item-nbt-api</artifactId>
+            <version>2.12.2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/banner/CmdBanner.java b/src/main/java/com/massivecraft/factions/cmd/banner/CmdBanner.java
index 78483979d..6e77cb1e4 100644
--- a/src/main/java/com/massivecraft/factions/cmd/banner/CmdBanner.java
+++ b/src/main/java/com/massivecraft/factions/cmd/banner/CmdBanner.java
@@ -9,7 +9,7 @@
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.util.CC;
 import com.massivecraft.factions.zcore.util.TL;
-import de.tr7zw.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NBTItem;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/banner/listener/BannerListener.java b/src/main/java/com/massivecraft/factions/cmd/banner/listener/BannerListener.java
index 96117ebdf..b4d48c25b 100644
--- a/src/main/java/com/massivecraft/factions/cmd/banner/listener/BannerListener.java
+++ b/src/main/java/com/massivecraft/factions/cmd/banner/listener/BannerListener.java
@@ -6,7 +6,7 @@
 import com.massivecraft.factions.struct.Relation;
 import com.massivecraft.factions.util.CC;
 import com.massivecraft.factions.zcore.util.TL;
-import de.tr7zw.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NBTItem;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

From 43df7c97dd80ff9e75b3a86664ff04128a4ac006 Mon Sep 17 00:00:00 2001
From: Selena Rose Hammond <selenarosehammond@gmail.com>
Date: Sat, 6 Jan 2024 10:46:43 +1300
Subject: [PATCH 3/3] Fixed issue with f chest saying "(!) That item no longer
 exists!" when clicking the players inventory with matching slot number

---
 .../com/massivecraft/factions/cmd/audit/FChestListener.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/massivecraft/factions/cmd/audit/FChestListener.java b/src/main/java/com/massivecraft/factions/cmd/audit/FChestListener.java
index 04162c7c6..5732d3bd4 100644
--- a/src/main/java/com/massivecraft/factions/cmd/audit/FChestListener.java
+++ b/src/main/java/com/massivecraft/factions/cmd/audit/FChestListener.java
@@ -70,7 +70,7 @@ public void onPlayerClickInventory(InventoryClickEvent event) {
 
         if (event.getView().getTitle().equalsIgnoreCase(CC.translate(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title"))) && !event.getClick().isShiftClick()) {
             if (currentItemType != Material.AIR) {
-                if (factionChestInventory == null || !factionChestInventory.contains(currentItem)) {
+                if ((factionChestInventory == null || !factionChestInventory.contains(currentItem)) && clickedInventory == factionChestInventory) {
                     event.setCancelled(true);
                     player.sendMessage(CC.RedB + "(!) That item no longer exists!");
                     Bukkit.getLogger().info("[FactionChest] " + player.getName() + " tried to remove " + currentItem + " from /f chest when it didn't contain! Items: " + (factionChestInventory == null ? "none" : Arrays.toString(factionChestInventory.getContents())));