-From 5017fe3f6491b212ab9563fa6c2fa38b12a38c15 Mon Sep 17 00:00:00 2001
+From 863fcf8d7cec3dcfcc29ad8f755c1e18fda232f9 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 21 Jul 2018 17:14:39 +0100
 Subject: [PATCH] 1.13 protocol support
 
 
+diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+index 10e16d79..f902301e 100644
+--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
++++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+@@ -5,6 +5,9 @@ import io.netty.buffer.ByteBuf;
+ import java.util.ArrayList;
+ import java.util.List;
+ import lombok.RequiredArgsConstructor;
++import net.md_5.bungee.api.chat.BaseComponent; // Waterfall - 1.13
++import net.md_5.bungee.api.chat.TextComponent; // Waterfall - 1.13
++import net.md_5.bungee.chat.ComponentSerializer; // Waterfall - 1.13
+ 
+ import java.util.UUID;
+ 
+@@ -183,6 +186,15 @@ public abstract class DefinedPacket
+         return new UUID( input.readLong(), input.readLong() );
+     }
+ 
++    // Waterfall start - 1.13
++    public static String readComponentAsString(ByteBuf buf)
++    {
++        String json = readString(buf);
++        BaseComponent[] components = ComponentSerializer.parse(json);
++        return components[0] == null ? json : TextComponent.toLegacyText(components);
++    }
++    // Waterfall end - 1.13
++
+     public void read(ByteBuf buf)
+     {
+         throw new UnsupportedOperationException( "Packet must implement read method" );
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
-index 6279d9f3..f1ad722d 100644
+index 6279d9f3..9f9c76fc 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
 @@ -1,5 +1,8 @@

             if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_13 )
             {
+                // Waterfall start - 1.13
+                String jsonName = readString(buf);
+                name = TextComponent.toLegacyText(ComponentSerializer.parse(jsonName));
                 type = HealthDisplay.values()[readVarInt( buf )];
             } else
             {

             }
         }
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
index f93508d9..8be62c7b 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
@@ -1,5 +1,8 @@
