From b4498e1368e451abc81aa4df4be90369fe711e0b Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Mon, 14 Nov 2016 21:09:12 +0000 Subject: [PATCH] Merge upstream --- BungeeCord | 2 +- .../0018-Allow-invalid-packet-ids-for-forge-servers.patch | 6 +++--- BungeeCord-Patches/0030-Better-debug-checks.patch | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BungeeCord b/BungeeCord index 9ecdde2..72002ed 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 9ecdde2292885b2fbf95c43a386c291f735a1770 +Subproject commit 72002ed3bd813ec817642ae76afbfecc454af462 diff --git a/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch index 5e16170..28b2d1e 100644 --- a/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch +++ b/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch @@ -1,4 +1,4 @@ -From c010e5f3d60e76061b99aa1da64243a866f465ab Mon Sep 17 00:00:00 2001 +From 589e016fa89ab5857d865d1e88d8f71c3631046b Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 19 May 2016 17:09:22 -0600 Subject: [PATCH] Allow invalid packet ids for forge servers @@ -37,10 +37,10 @@ index e7cb380..447eaae 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 c5a7add..7ec0f29 100644 +index 01f2344..b36e65f 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 -@@ -279,14 +279,18 @@ public enum Protocol +@@ -280,14 +280,18 @@ public enum Protocol return protocol; } diff --git a/BungeeCord-Patches/0030-Better-debug-checks.patch b/BungeeCord-Patches/0030-Better-debug-checks.patch index 5aac850..75096bb 100644 --- a/BungeeCord-Patches/0030-Better-debug-checks.patch +++ b/BungeeCord-Patches/0030-Better-debug-checks.patch @@ -1,14 +1,14 @@ -From 576e048b3cdd05938f69a54e4a6510dc501734af Mon Sep 17 00:00:00 2001 +From 218cba36169895a2d0184c132cec9c7aca00e334 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 6 Apr 2016 23:46:00 -0700 Subject: [PATCH] Better debug checks 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 7ec0f29..0aa16c3 100644 +index b36e65f..8a857ad 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 -@@ -347,7 +347,7 @@ public enum Protocol +@@ -348,7 +348,7 @@ public enum Protocol { throw new BadPacketException( "Unsupported protocol version" ); }