From 724858ac704f0e012473a9dcbd0bc2c7a9f5afdb Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Mon, 18 Jan 2021 17:18:35 +0100
Subject: [PATCH] Fix tellRaw for 1.16.4/1.16.5

---
 pom.xml                                        |  3 +--
 .../java/buttondevteam/chat/VanillaUtils.java  | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index be66478..755c982 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,8 +161,7 @@
         <!-- <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.14.4-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
+            <version>1.16.4-R0.1-SNAPSHOT</version>
         </dependency> -->
 		<dependency>
 			<groupId>com.github.webbukkit</groupId>
diff --git a/src/main/java/buttondevteam/chat/VanillaUtils.java b/src/main/java/buttondevteam/chat/VanillaUtils.java
index 54cd810..4bcb67a 100644
--- a/src/main/java/buttondevteam/chat/VanillaUtils.java
+++ b/src/main/java/buttondevteam/chat/VanillaUtils.java
@@ -7,6 +7,8 @@ import lombok.val;
 import org.bukkit.entity.Player;
 
 import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.util.UUID;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
@@ -84,7 +86,16 @@ public class VanillaUtils {
 				val chatcompcl = Class.forName(nms + ".IChatBaseComponent");
 				//val chatcomarrcl = Class.forName("[L" + chatcompcl.getName() + ";");
 				val chatcomparr = Array.newInstance(chatcompcl, 1);
-				val sendmsg = handle.getClass().getMethod("sendMessage", chatcomparr.getClass());
+				final Method sendmsg;
+				{
+					Method sendmsg1;
+					try {
+						sendmsg1 = handle.getClass().getMethod("sendMessage", UUID.class, chatcomparr.getClass());
+					} catch (NoSuchMethodException e) {
+						sendmsg1 = handle.getClass().getMethod("sendMessage", chatcomparr.getClass());
+					}
+					sendmsg = sendmsg1;
+				}
 
 				/*val ccucl = Class.forName(nms + ".ChatComponentUtils");
 				val iclcl = Class.forName(nms + ".ICommandListener");
@@ -101,7 +112,10 @@ public class VanillaUtils {
 						val deserialized = am.invoke(null, jsonStr);
 						//val filtered = ffdm.invoke(null, hhandle, deserialized, hhandle);
 						Array.set(chatcomparr, 0, deserialized);
-						sendmsg.invoke(hhandle, chatcomparr);
+						if (sendmsg.getParameterCount() == 2)
+							sendmsg.invoke(hhandle, null, chatcomparr); //
+						else
+							sendmsg.invoke(hhandle, chatcomparr);
 						return true;
 					} catch (Exception e) {
 						e.printStackTrace();