From 9b7ee19141c8f1e2b3982e71e1fea9b62f48f86b Mon Sep 17 00:00:00 2001
From: McDaddyTalk <kbtalkin@gmail.com>
Date: Sun, 14 Mar 2021 12:16:07 -0400
Subject: [PATCH] Fix for #97:  Commands and UUID

---
 pom.xml                                       | 54 +++++++++++++------
 .../treasurechest/v8/util/BukkitUtil.java     |  2 +-
 src/main/resources/plugin.yml                 |  4 +-
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 551320d..72163f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mtihc.minecraft.treasurechest.v8.plugin</groupId>
     <artifactId>TreasureChest</artifactId>
-    <version>8.5</version>
+    <version>8.6</version>
     <name>TreasureChest</name>
     <url>http://dev.bukkit.org/server-mods/treasurechest/</url>
     <repositories>
@@ -11,28 +11,31 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
-        <repository><!-- needed for worldedit 7 -->
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
-        </repository>
+
         <repository>
-            <id>sk89q-repo</id>
-            <url>http://maven.sk89q.com/repo/</url>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
         </repository>
+
         <repository>
-            <id>milkbowl-repo</id>
+            <id>vault-repo</id>
             <url>http://nexus.hc.to/content/repositories/pub_releases</url>
         </repository>
+
+        <repository>
+            <id>enginehub-maven</id>
+            <url>http://maven.enginehub.org/repo/</url>
+        </repository>
     </repositories>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
@@ -41,20 +44,37 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.14.1-R0.1-SNAPSHOT</version>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Vault API -->
+        <dependency>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- WorldGuard API -->
+        <!-- This depends on the Bukkit API, Use this if you need BukkitAdapter -->
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
+            <version>7.2.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+
+        <!-- This doesn't depend on any platform -->
         <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <version>1.6</version>
-            <scope>compile</scope>
+            <groupId>com.sk89q.worldedit</groupId>
+            <artifactId>worldedit-core</artifactId>
+            <version>7.2.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/com/mtihc/minecraft/treasurechest/v8/util/BukkitUtil.java b/src/main/java/com/mtihc/minecraft/treasurechest/v8/util/BukkitUtil.java
index f7c3e05..dc80326 100644
--- a/src/main/java/com/mtihc/minecraft/treasurechest/v8/util/BukkitUtil.java
+++ b/src/main/java/com/mtihc/minecraft/treasurechest/v8/util/BukkitUtil.java
@@ -13,7 +13,7 @@ public static OfflinePlayer findOfflinePlayer(String playerName) throws CommandE
 		OfflinePlayer p = null;
 		OfflinePlayer[] offlinePlayers = Bukkit.getOfflinePlayers();
 		for (OfflinePlayer offlinePlayer : offlinePlayers) {
-			if (offlinePlayer.getName().toLowerCase() == playerName.toLowerCase()) {
+			if (offlinePlayer.getName().equalsIgnoreCase(playerName)) {
 				if (p != null) {
 					throw new CommandException("Found multiple players named \"" + playerName + "\". Try using a UUID instead.");
 				}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 2f4db3a..56b796c 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -6,8 +6,8 @@ startup: postworld
 url: http://dev.bukkit.org/server-mods/treasurechest/
 depend: []
 softdepend: [Vault, WorldEdit]
-version: 8.5
-api-version: 1.14
+version: 8.6
+api-version: 1.16
 commands:
     treasurechest:
         aliases: [tchest]