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

Merge upstream - Minecraft 1.12-pre5 support

Browse Source
This commit is contained in:
Jamie Mansfield 2017-05-19 21:51:18 +01:00
parent 474774102e
commit 9432ed7e40
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 16d261553c1a648ce38101bda19b7166d1ca5a41 Subproject commit 09ee2b1644ab3698aba67c91808ef8cb758ebb17

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

@ -1,4 +1,4 @@
From 8faa93de2ad9295f92d53da48e907cfd10aa8f6f Mon Sep 17 00:00:00 2001 From b0d889f9e4b93671ec5999b6c89b2a39155bf6ae Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com> From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200 Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -32,7 +32,7 @@ index 6f782c8f..2d5fc487 100644
+ // Waterfall end + // 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 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 a7036833..c59006d6 100644 index a2eeb024..d6d278c9 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
@@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat; @@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;
@ -46,7 +46,7 @@ index a7036833..c59006d6 100644
import net.md_5.bungee.protocol.packet.Kick; import net.md_5.bungee.protocol.packet.Kick;
@@ -86,6 +88,22 @@ public enum Protocol @@ -86,6 +88,22 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_9, 0x0C ), map( ProtocolConstants.MINECRAFT_1_9, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0D ) map( ProtocolConstants.MINECRAFT_1_12, 0x0C )
); );
+ // Waterfall start + // Waterfall start
+ TO_CLIENT.registerPacket( + TO_CLIENT.registerPacket(
@ -269,5 +269,5 @@ index 673497e5..17e250d4 100644
* Sends the server mod list to the client, or stores it for sending later. * Sends the server mod list to the client, or stores it for sending later.
* *
-- --
2.13.0.windows.1 2.13.0