From 2791f90c9c3e534c7e8a5683b8529fc2f73624e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9D=8F=E9=BB=91?= <sky@asgard.me>
Date: Tue, 28 May 2019 22:35:26 +0800
Subject: [PATCH] + tellraw fixed

---
 .../taboolib/json/tellraw/TellrawJson.java    | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/scala/me/skymc/taboolib/json/tellraw/TellrawJson.java b/src/main/scala/me/skymc/taboolib/json/tellraw/TellrawJson.java
index 60df295..265c8fa 100644
--- a/src/main/scala/me/skymc/taboolib/json/tellraw/TellrawJson.java
+++ b/src/main/scala/me/skymc/taboolib/json/tellraw/TellrawJson.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Author sky
@@ -70,13 +69,7 @@ public class TellrawJson {
 
     public void send(CommandSender sender, String... args) {
         if (sender instanceof Player) {
-            if (TellrawCreator.isViaVersionLoaded()) {
-                TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage(Via.getAPI().getPlayerVersion(sender) > 316 ? TellrawVersion.HIGH_VERSION : TellrawVersion.LOW_VERSION), args));
-            } else if (TellrawCreator.isProtocolSupportLoaded()) {
-                TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage(ProtocolSupportAPI.getProtocolVersion((Player) sender).getId() > 316 ? TellrawVersion.HIGH_VERSION : TellrawVersion.LOW_VERSION), args));
-            } else {
-                TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage(), args));
-            }
+            TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage((Player) sender), args));
         } else {
             TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage(), args));
         }
@@ -97,6 +90,18 @@ public class TellrawJson {
         return rawMessage;
     }
 
+    public String toRawMessage(Player player) {
+        // ViaVersion support!
+        if (TellrawCreator.isViaVersionLoaded()) {
+            return toRawMessage(Via.getAPI().getPlayerVersion(player) > 316 ? TellrawVersion.HIGH_VERSION : TellrawVersion.LOW_VERSION);
+        }
+        // ProtocolSupport support!
+        else if (TellrawCreator.isProtocolSupportLoaded()) {
+            return toRawMessage(ProtocolSupportAPI.getProtocolVersion(player).getId() > 316 ? TellrawVersion.HIGH_VERSION : TellrawVersion.LOW_VERSION);
+        }
+        return toRawMessage();
+    }
+
     public String toLegacyText() {
         return TextComponent.toLegacyText(getComponentsAll());
     }
@@ -161,9 +166,8 @@ public class TellrawJson {
     }
 
     public BaseComponent[] getComponentsAll() {
-        List<BaseComponent> components = this.components.stream().filter(component -> !(component instanceof TextComponent) || !((TextComponent) component).getText().isEmpty()).collect(Collectors.toList());
         this.componentsLatest.stream().filter(component -> !(component instanceof TextComponent) || !((TextComponent) component).getText().isEmpty()).forEach(components::add);
-        return components.toArray(new BaseComponent[0]);
+        return this.components.stream().filter(component -> !(component instanceof TextComponent) || !((TextComponent) component).getText().isEmpty()).toArray(BaseComponent[]::new);
     }
 
     @Deprecated