Merge upstream

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

@@ -1,4 +1,4 @@
-From dd2af3af4926e0c273f5554ac74970ad9df08c2b Mon Sep 17 00:00:00 2001
+From 09125a80b5c210108da6bfdcd82b6a70a1099377 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -37,10 +37,10 @@ index ea44573d..5b32effe 100644
              {
                  packet.read( in, prot.getDirection(), protocolVersion );
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index 76c2bea0..96d3c99e 100644
+index 9509f8ee..60de276e 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-@@ -397,14 +397,23 @@ public enum Protocol
+@@ -391,14 +391,23 @@ public enum Protocol
              return protocol;
          }
 

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

@@ -1,77 +1,9 @@
-From 21ac4d87d54a63506f190bc9f7e49b6d6595534a Mon Sep 17 00:00:00 2001
+From 5b1a96af91f4337f5c724daa15ed0351f23ff3b8 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 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/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index a8ac332a..a248c7db 100644
---- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-@@ -267,42 +267,36 @@ public enum Protocol
-         {
-             TO_CLIENT.registerPacket(
-                     LoginPayloadRequest.class,
--                    map( ProtocolConstants.MINECRAFT_1_13, 0x00 )
-+                    map( ProtocolConstants.MINECRAFT_1_13, 0x04 )
-             );
-             TO_CLIENT.registerPacket(
-                     Kick.class,
--                    map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
--                    map( ProtocolConstants.MINECRAFT_1_13, 0x01 )
-+                    map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
-             );
-             TO_CLIENT.registerPacket(
-                     EncryptionRequest.class,
--                    map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
--                    map( ProtocolConstants.MINECRAFT_1_13, 0x02 )
-+                    map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
-             );
-             TO_CLIENT.registerPacket(
-                     LoginSuccess.class,
--                    map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
--                    map( ProtocolConstants.MINECRAFT_1_13, 0x03 )
-+                    map( ProtocolConstants.MINECRAFT_1_8, 0x02 )
-             );
-             TO_CLIENT.registerPacket(
-                     SetCompression.class,
--                    map( ProtocolConstants.MINECRAFT_1_8, 0x03 ),
--                    map( ProtocolConstants.MINECRAFT_1_13, 0x04 )
-+                    map( ProtocolConstants.MINECRAFT_1_8, 0x03 )
-             );
-
-             TO_SERVER.registerPacket(
-                     LoginPayloadResponse.class,
--                    map( ProtocolConstants.MINECRAFT_1_13, 0x00 )
-+                    map( ProtocolConstants.MINECRAFT_1_13, 0x02 )
-             );
-             TO_SERVER.registerPacket(
-                     LoginRequest.class,
--                    map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
--                    map( ProtocolConstants.MINECRAFT_1_13, 0x01 )
-+                    map( ProtocolConstants.MINECRAFT_1_8, 0x00 )
-             );
-             TO_SERVER.registerPacket(
-                     EncryptionResponse.class,
--                    map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
--                    map( ProtocolConstants.MINECRAFT_1_13, 0x02 )
-+                    map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
-             );
-         }
-     };
-diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-index bba6cb2d..b2dc9423 100644
---- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-@@ -17,7 +17,7 @@ public class ProtocolConstants
-     public static final int MINECRAFT_1_12 = 335;
-     public static final int MINECRAFT_1_12_1 = 338;
-     public static final int MINECRAFT_1_12_2 = 340;
--    public static final int MINECRAFT_1_13 = 389;
-+    public static final int MINECRAFT_1_13 = 393;
-     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
-             "1.8.x",
-             "1.9.x",
 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
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java

waterfall

@@ -8,7 +8,7 @@ case "$1" in
         scripts/applyPatches.sh
     ;;
     "m" | "up" | "merge")
-        scrips/mergeUpstream.sh
+        scripts/mergeUpstream.sh
     ;;
     "b" | "build")
         scripts/build.sh