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

fix dangling fixup patch

Browse Source
This commit is contained in:
Shane Freeder 2019-03-03 01:47:29 +00:00
parent f23ec52afd
commit 04edf2ee50
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From 048c8c798e9623855157222e4f535208e1c0d081 Mon Sep 17 00:00:00 2001
From e933e744f00c8910885eb33b2f3c55c0c3eeb946 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
@ -33,7 +33,7 @@ index 219488dd..bef7b370 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 fac02784..52ee3461 100644
index fac02784..4966d0a5 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
@@ -15,6 +15,8 @@ import net.md_5.bungee.protocol.packet.Commands;
@ -45,7 +45,7 @@ index fac02784..52ee3461 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;
@@ -88,6 +90,26 @@ public enum Protocol
@@ -88,6 +90,25 @@ public enum Protocol
BossBar.class,
map( ProtocolConstants.MINECRAFT_1_9, 0x0C )
);
@ -55,7 +55,6 @@ index fac02784..52ee3461 100644
+ map(ProtocolConstants.MINECRAFT_1_8, 0x1D),
+ 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_1, 0x4F),
+ map(ProtocolConstants.MINECRAFT_1_13, 0x53)

2
BungeeCord-Patches/0049-Handle-empty-minecraft-packets.patch → BungeeCord-Patches/0048-Handle-empty-minecraft-packets.patch
View File

@ -1,4 +1,4 @@
From 17af604ecbbdd56ce2bbf2e342b63083bee4c006 Mon Sep 17 00:00:00 2001
From 62d85acdf158c55858400c724d4f5cab7e310fcf Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 26 Feb 2019 20:15:54 +0000
Subject: [PATCH] Handle empty minecraft packets

21
BungeeCord-Patches/0048-fixup-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,21 +0,0 @@
From be1c40f01873b60d3b96692fb54594c6fc7dc7bd Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 26 Feb 2019 19:36:42 +0000
Subject: [PATCH] fixup! Fix potion race condition on Forge 1.8.9
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 52ee3461..4966d0a5 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
@@ -96,7 +96,6 @@ public enum Protocol
map(ProtocolConstants.MINECRAFT_1_8, 0x1D),
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_1, 0x4F),
map(ProtocolConstants.MINECRAFT_1_13, 0x53)
--
2.21.0