From e26d5490be6ad9d061bad66a3418cd4aec10e1da Mon Sep 17 00:00:00 2001
From: xjboss <i@xjboss.net>
Date: Tue, 12 Mar 2019 16:31:27 +0000
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E7=89=88=E6=9C=AC=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/pw/yumc/YumCore/bukkit/compatible/C.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/pw/yumc/YumCore/bukkit/compatible/C.java b/src/main/java/pw/yumc/YumCore/bukkit/compatible/C.java
index 59ac357..b88e6e1 100644
--- a/src/main/java/pw/yumc/YumCore/bukkit/compatible/C.java
+++ b/src/main/java/pw/yumc/YumCore/bukkit/compatible/C.java
@@ -55,9 +55,7 @@ public class C {
         version=getNMSVersion();
         titlePAB=false;
         try {
-            try {
-                cauldron1710 = version.equals("v1_7_R4") && Package.getPackage("net.minecraftforge.cauldron") != null;
-            }catch (Exception e){}
+            cauldron1710 = version.equals("v1_7_R4") && Package.getPackage("net.minecraftforge.cauldron") != null;
             if(cauldron1710) {
                 try{
                     Class.forName("cc.uraniummc.Uranium");
@@ -79,7 +77,7 @@ public class C {
                 packetType = Class.forName(a("PacketPlayOutChat"));
             }
             Arrays.stream(packetType.getConstructors()).forEach(c -> {
-                if (c.getParameterTypes().length == 2) {
+                if (c.getParameterTypes().length == 2&&!c.getParameterTypes()[1].getName().equals("boolean")) {
                     packetTypeConstructor = c;
                 }
             });
@@ -97,7 +95,11 @@ public class C {
                     nmsChatMessageTypeClassValueOf = nmsChatMessageTypeClass.getDeclaredMethod("valueOf", String.class);
                 }
             } catch (Exception e) {
-                packetTypeConstructor = packetType.getConstructor(String.class);
+                try {
+                    packetTypeConstructor = packetType.getConstructor(String.class);
+                }catch (Exception e2){
+                    packetTypeConstructor = packetType.getConstructor(nmsIChatBaseComponent);
+                }
             }
             Class<?> typeCraftPlayer = Class.forName(b("entity.CraftPlayer"));
             getHandle = typeCraftPlayer.getMethod("getHandle");