Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-06-26 14:35:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge upstream - Minecraft 1.12.1 support

Browse Source
This commit is contained in:
Jamie Mansfield 2017-08-03 16:42:52 +01:00
parent c7cd61c968
commit a90dae10c9
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit caeb7246f0bdd6f8a35bee2ee64f0afd175df89d
Subproject commit 017f3a2424e0a210d5bdfbf45720aa1ef073a223

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

@ -1,4 +1,4 @@
From 413c03afc73fede6e6f1eecf0c020dceaa84ed92 Mon Sep 17 00:00:00 2001
From 07c2f62e5c41051c6b3a7567e8b199ca6dcb614a 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
@ -37,10 +37,10 @@ index e7cb3803..447eaae7 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 57a93c93..0dfc4a31 100644
index 61e2b42d..c92a922a 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
@@ -336,14 +336,23 @@ public enum Protocol
@@ -352,14 +352,23 @@ public enum Protocol
return protocol;
}
@ -93,7 +93,7 @@ index f25b26d6..ed057b8a 100644
ch.write( BungeeCord.getInstance().registerChannels() );
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 87e9e239..2bd88ac4 100644
index a70ac2c9..bbc56eed 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -69,6 +69,7 @@ public final class UserConnection implements ProxiedPlayer
@ -105,10 +105,10 @@ index 87e9e239..2bd88ac4 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 6a794175..ec154429 100644
index 3e0ec0d5..a6d9310f 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
@@ -208,6 +208,12 @@ public abstract class EntityMap
@@ -210,6 +210,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;

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

@ -1,14 +1,14 @@
From 3c673a369304650e538163d8054132eb00a295ec Mon Sep 17 00:00:00 2001
From 3436ebcbc3e03fea4854418225d787f9760be408 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
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 0dfc4a31..a7036833 100644
index c92a922a..34260bd3 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
@@ -409,7 +409,7 @@ public enum Protocol
@@ -425,7 +425,7 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}

16
BungeeCord-Patches/0039-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From 7b94bf37323209f817606573449e0c52ed04f7e9 Mon Sep 17 00:00:00 2001
From 116b5b27ce7b9f44acde7bbc4291b52c22aae800 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -32,7 +32,7 @@ index 6f782c8f..2d5fc487 100644
+ // Waterfall end
}
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 a2eeb024..18c99076 100644
index 34260bd3..62635c5b 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
@@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;
@ -44,7 +44,7 @@ index a2eeb024..18c99076 100644
import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
@@ -86,6 +88,22 @@ public enum Protocol
@@ -87,6 +89,24 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_9, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C )
);
@ -55,13 +55,15 @@ index a2eeb024..18c99076 100644
+ map(ProtocolConstants.MINECRAFT_1_9, 0x4C),
+ map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B),
+ map(ProtocolConstants.MINECRAFT_1_10, 0x4B),
+ map(ProtocolConstants.MINECRAFT_1_12, 0x4E)
+ map(ProtocolConstants.MINECRAFT_1_12, 0x4E),
+ map(ProtocolConstants.MINECRAFT_1_12_1, 0x4F)
+ );
+ TO_CLIENT.registerPacket(
+ EntityRemoveEffect.class,
+ map(ProtocolConstants.MINECRAFT_1_8, 0x1E),
+ map(ProtocolConstants.MINECRAFT_1_9, 0x31),
+ map(ProtocolConstants.MINECRAFT_1_12, 0x32)
+ map(ProtocolConstants.MINECRAFT_1_12, 0x32),
+ map(ProtocolConstants.MINECRAFT_1_12_1, 0x33)
+ );
+ // Waterfall end
TO_CLIENT.registerPacket(
@ -161,7 +163,7 @@ index 00000000..7ed2dc3a
+ }
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 23e03ca2..e1aa8213 100644
index 8a15f59c..5831514e 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -2,7 +2,9 @@ package net.md_5.bungee;
@ -269,5 +271,5 @@ index 673497e5..17e250d4 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.13.0.windows.1
2.13.0