Merge upstream

BungeeCord

@@ -1 +1 @@
-Subproject commit c9f22868b3dfc6e42ad19185e1eb515c5c227723
+Subproject commit 6fadb4250cb7f89feb2a98d9de973f6d627e33ae

BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch

@@ -1,4 +1,4 @@
-From 3a1e84a28f704518a635c4fa16c51c2693250976 Mon Sep 17 00:00:00 2001
+From 89d3ecb735005494425fbc9f882cb9449a17f7e4 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -105,10 +105,10 @@ index bc1227a5..61502ea8 100644
      @Getter
      @NonNull
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index cae566f5..bad9773b 100644
+index c65a8481..4df06119 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-@@ -264,6 +264,12 @@ public abstract class EntityMap
+@@ -267,6 +267,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
  

BungeeCord-Patches/0048-1.13-scoreboard-support.patch

@@ -1,7 +1,7 @@
-From 863fcf8d7cec3dcfcc29ad8f755c1e18fda232f9 Mon Sep 17 00:00:00 2001
+From a25bca47d6013791dfb61366811c8546d8d86422 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
+Subject: [PATCH] 1.13 scoreboard 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
@@ -157,5 +157,5 @@ index f93508d9..8be62c7b 100644
              {
                  buf.writeByte( color );
 -- 
-2.13.2.windows.1
+2.18.0