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

Use correct packet ids for 1.12-pre2 (#135)

Browse Source
This commit is contained in:
Black Hole 2017-05-15 17:54:56 +02:00 committed by Techcable
parent 710c45640c
commit 474774102e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
From 8ba224224c6c0c0701224baea319e6f1e9bd5cd7 Mon Sep 17 00:00:00 2001 From 8faa93de2ad9295f92d53da48e907cfd10aa8f6f Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com> From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 16:38:37 -0400 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 5636e67c..abc5b535 100644 index a7036833..c59006d6 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;
@ -44,7 +44,7 @@ index 5636e67c..abc5b535 100644
import net.md_5.bungee.protocol.packet.Handshake; import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.KeepAlive; import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick; import net.md_5.bungee.protocol.packet.Kick;
@@ -86,6 +88,21 @@ 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, 0x0D )
); );
@ -54,13 +54,14 @@ index 5636e67c..abc5b535 100644
+ map(ProtocolConstants.MINECRAFT_1_8, 0x1D), + map(ProtocolConstants.MINECRAFT_1_8, 0x1D),
+ map(ProtocolConstants.MINECRAFT_1_9, 0x4C), + map(ProtocolConstants.MINECRAFT_1_9, 0x4C),
+ map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B), + map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B),
+ map(ProtocolConstants.MINECRAFT_1_10, 0x4B) + map(ProtocolConstants.MINECRAFT_1_10, 0x4B),
+ + map(ProtocolConstants.MINECRAFT_1_12, 0x4D)
+ ); + );
+ TO_CLIENT.registerPacket( + TO_CLIENT.registerPacket(
+ EntityRemoveEffect.class, + EntityRemoveEffect.class,
+ map(ProtocolConstants.MINECRAFT_1_8, 0x1E), + map(ProtocolConstants.MINECRAFT_1_8, 0x1E),
+ map(ProtocolConstants.MINECRAFT_1_9, 0x31) + map(ProtocolConstants.MINECRAFT_1_9, 0x31),
+ map(ProtocolConstants.MINECRAFT_1_12, 0x33)
+ ); + );
+ // Waterfall end + // Waterfall end
TO_CLIENT.registerPacket( TO_CLIENT.registerPacket(
@ -268,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.12.0 2.13.0.windows.1