Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-24 19:25:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2016-11-14 21:09:12 +00:00
parent 65bfdc7fe1
commit b4498e1368
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 9ecdde2292885b2fbf95c43a386c291f735a1770 Subproject commit 72002ed3bd813ec817642ae76afbfecc454af462

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

@ -1,4 +1,4 @@
From c010e5f3d60e76061b99aa1da64243a866f465ab Mon Sep 17 00:00:00 2001 From 589e016fa89ab5857d865d1e88d8f71c3631046b Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600 Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers Subject: [PATCH] Allow invalid packet ids for forge servers
@ -37,10 +37,10 @@ index e7cb380..447eaae 100644
{ {
packet.read( in, prot.getDirection(), protocolVersion ); 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 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 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/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; return protocol;
} }

6
BungeeCord-Patches/0030-Better-debug-checks.patch
View File

@ -1,14 +1,14 @@
From 576e048b3cdd05938f69a54e4a6510dc501734af Mon Sep 17 00:00:00 2001 From 218cba36169895a2d0184c132cec9c7aca00e334 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Wed, 6 Apr 2016 23:46:00 -0700 Date: Wed, 6 Apr 2016 23:46:00 -0700
Subject: [PATCH] Better debug checks 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 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 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/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" ); throw new BadPacketException( "Unsupported protocol version" );
} }