From 34266257061f202518d238151859f3b9cbcaf2f7 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 10 Dec 2019 22:53:39 +0000 Subject: [PATCH] Updated Upstream (BungeeCord) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 4cccf537 Minecraft 1.15 support --- BungeeCord | 2 +- BungeeCord-Patches/0001-POM-Changes.patch | 108 +++++++++--------- .../0008-Fixup-ProtocolConstants.patch | 10 +- ...invalid-packet-ids-for-forge-servers.patch | 14 +-- ...potion-race-condition-on-Forge-1.8.9.patch | 16 +-- ...n-to-disable-entity-metadata-rewriti.patch | 23 ++-- .../0053-Speed-up-packet-construction.patch | 68 ++++++----- 7 files changed, 125 insertions(+), 116 deletions(-) diff --git a/BungeeCord b/BungeeCord index 70038c9..4cccf53 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 70038c91442eeba7b96ec065491f57201805beac +Subproject commit 4cccf53775fc88b008e102bfd6d0cdcc7a044ac0 diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch index 9c538c6..19c78e5 100644 --- a/BungeeCord-Patches/0001-POM-Changes.patch +++ b/BungeeCord-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 41a4567c85b0cb1133ce5aac8a6a14561db911d0 Mon Sep 17 00:00:00 2001 +From aef15f316574d636b1fbf9a205c4406eb7279be5 Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 19:33:31 +0200 Subject: [PATCH] POM Changes @@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes - Deploy to papermc mvn repo diff --git a/api/pom.xml b/api/pom.xml -index 79d2d367..f0348e13 100644 +index 30eef5dc..afc4e46e 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,42 +4,42 @@ @@ -18,7 +18,7 @@ index 79d2d367..f0348e13 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -26,7 +26,7 @@ index 79d2d367..f0348e13 100644 - bungeecord-api + io.github.waterfallmc + waterfall-api - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-API @@ -67,7 +67,7 @@ index 79d2d367..f0348e13 100644 compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index acc6aa97..cce76af4 100644 +index 9a11e65a..5e9b2ab3 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -4,19 +4,19 @@ @@ -78,7 +78,7 @@ index acc6aa97..cce76af4 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -86,7 +86,7 @@ index acc6aa97..cce76af4 100644 - bungeecord-bootstrap + io.github.waterfallmc + waterfall-bootstrap - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-Bootstrap @@ -138,7 +138,7 @@ index 6be22739..a4516ed9 100644 return; } diff --git a/chat/pom.xml b/chat/pom.xml -index 5f87b60d..7ad05abb 100644 +index 4ca669f9..0bd76ea5 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -4,19 +4,19 @@ @@ -149,7 +149,7 @@ index 5f87b60d..7ad05abb 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -157,7 +157,7 @@ index 5f87b60d..7ad05abb 100644 - bungeecord-chat + io.github.waterfallmc + waterfall-chat - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-Chat @@ -168,7 +168,7 @@ index 5f87b60d..7ad05abb 100644 diff --git a/config/pom.xml b/config/pom.xml -index 83c36691..0ffb071c 100644 +index 4b44d27e..764fcc6b 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -4,19 +4,19 @@ @@ -179,7 +179,7 @@ index 83c36691..0ffb071c 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -187,7 +187,7 @@ index 83c36691..0ffb071c 100644 - bungeecord-config + io.github.waterfallmc + waterfall-config - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-Config @@ -198,7 +198,7 @@ index 83c36691..0ffb071c 100644 diff --git a/event/pom.xml b/event/pom.xml -index 2de6603c..d6efe097 100644 +index e86d9887..5eb97c1f 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -4,17 +4,17 @@ @@ -209,7 +209,7 @@ index 2de6603c..d6efe097 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -217,7 +217,7 @@ index 2de6603c..d6efe097 100644 - bungeecord-event + io.github.waterfallmc + waterfall-event - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-Event @@ -226,7 +226,7 @@ index 2de6603c..d6efe097 100644 + Generic java event dispatching API intended for use with Waterfall. diff --git a/log/pom.xml b/log/pom.xml -index 05c5f2c9..fd999b51 100644 +index 59beca1b..23dacb1d 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -4,19 +4,19 @@ @@ -237,7 +237,7 @@ index 05c5f2c9..fd999b51 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -245,7 +245,7 @@ index 05c5f2c9..fd999b51 100644 - bungeecord-log + io.github.waterfallmc + waterfall-log - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-Log @@ -267,7 +267,7 @@ index 05c5f2c9..fd999b51 100644 compile diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml -index 1c4f643f..6f3aa272 100644 +index 36a7bca2..9340d58a 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -4,14 +4,14 @@ @@ -278,7 +278,7 @@ index 1c4f643f..6f3aa272 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -286,11 +286,11 @@ index 1c4f643f..6f3aa272 100644 - bungeecord-module-cmd-alert + io.github.waterfallmc + waterfall-module-cmd-alert - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml -index 3e43c9ae..01d95284 100644 +index 3dc2fe1e..c7106fe9 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -4,14 +4,14 @@ @@ -301,7 +301,7 @@ index 3e43c9ae..01d95284 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -309,11 +309,11 @@ index 3e43c9ae..01d95284 100644 - bungeecord-module-cmd-find + io.github.waterfallmc + waterfall-module-cmd-find - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml -index 99d6da26..bc5dc210 100644 +index 3077f1b7..e14d18e7 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -4,14 +4,14 @@ @@ -324,7 +324,7 @@ index 99d6da26..bc5dc210 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -332,11 +332,11 @@ index 99d6da26..bc5dc210 100644 - bungeecord-module-cmd-list + io.github.waterfallmc + waterfall-module-cmd-list - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml -index 4472f373..f6642175 100644 +index 54cbc090..68f526b1 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -4,14 +4,14 @@ @@ -347,7 +347,7 @@ index 4472f373..f6642175 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -355,11 +355,11 @@ index 4472f373..f6642175 100644 - bungeecord-module-cmd-send + io.github.waterfallmc + waterfall-module-cmd-send - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml -index 9be58576..c93ab2c9 100644 +index 875e8eb1..d8ebf472 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -4,14 +4,14 @@ @@ -370,7 +370,7 @@ index 9be58576..c93ab2c9 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -378,11 +378,11 @@ index 9be58576..c93ab2c9 100644 - bungeecord-module-cmd-server + io.github.waterfallmc + waterfall-module-cmd-server - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar diff --git a/module/pom.xml b/module/pom.xml -index 5255b34f..aa604f35 100644 +index 7c81fe86..7b05190b 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -4,19 +4,19 @@ @@ -393,7 +393,7 @@ index 5255b34f..aa604f35 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -401,7 +401,7 @@ index 5255b34f..aa604f35 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.14-SNAPSHOT + 1.15-SNAPSHOT pom - BungeeCord Modules @@ -430,7 +430,7 @@ index 5255b34f..aa604f35 100644 compile diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml -index c68041d3..e34bac42 100644 +index a6cc954d..c29ac52f 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -4,14 +4,14 @@ @@ -441,7 +441,7 @@ index c68041d3..e34bac42 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -449,11 +449,11 @@ index c68041d3..e34bac42 100644 - bungeecord-module-reconnect-yaml + io.github.waterfallmc + waterfall-module-reconnect-yaml - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar diff --git a/native/pom.xml b/native/pom.xml -index 959aae03..b5aeb99e 100644 +index f11cad04..f8b549dc 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -4,19 +4,19 @@ @@ -464,7 +464,7 @@ index 959aae03..b5aeb99e 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -472,7 +472,7 @@ index 959aae03..b5aeb99e 100644 - bungeecord-native + io.github.waterfallmc + waterfall-native - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-Native @@ -483,7 +483,7 @@ index 959aae03..b5aeb99e 100644 diff --git a/pom.xml b/pom.xml -index 27d46c41..537bf1a9 100644 +index 8ea1f089..5d5563a0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,25 @@ @@ -501,7 +501,7 @@ index 27d46c41..537bf1a9 100644 + + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT pom - BungeeCord-Parent @@ -702,7 +702,7 @@ index 27d46c41..537bf1a9 100644 + diff --git a/protocol/pom.xml b/protocol/pom.xml -index 61fedc71..2493fc17 100644 +index e11af008..4592e2b3 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -4,19 +4,19 @@ @@ -713,7 +713,7 @@ index 61fedc71..2493fc17 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -721,7 +721,7 @@ index 61fedc71..2493fc17 100644 - bungeecord-protocol + io.github.waterfallmc + waterfall-protocol - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-Protocol @@ -743,7 +743,7 @@ index 61fedc71..2493fc17 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index c6bb8fe3..cb02928c 100644 +index 97a75125..dbd4c79d 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -4,18 +4,18 @@ @@ -754,7 +754,7 @@ index c6bb8fe3..cb02928c 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -762,7 +762,7 @@ index c6bb8fe3..cb02928c 100644 - bungeecord-proxy + io.github.waterfallmc + waterfall-proxy - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-Proxy @@ -814,7 +814,7 @@ index c6bb8fe3..cb02928c 100644 compile diff --git a/query/pom.xml b/query/pom.xml -index 9cc2f80b..1fd54029 100644 +index 9c7d6f5a..c3a29122 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -4,19 +4,19 @@ @@ -825,7 +825,7 @@ index 9cc2f80b..1fd54029 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.14-SNAPSHOT + 1.15-SNAPSHOT ../pom.xml @@ -833,7 +833,7 @@ index 9cc2f80b..1fd54029 100644 - bungeecord-query + io.github.waterfallmc + waterfall-query - 1.14-SNAPSHOT + 1.15-SNAPSHOT jar - BungeeCord-Query diff --git a/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch b/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch index b81d01e..228ee93 100644 --- a/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch +++ b/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch @@ -1,15 +1,15 @@ -From f0277f104391f8616bad88a7e50ce9c740ea00c1 Mon Sep 17 00:00:00 2001 +From b6ece22debc4e9d518606f51d3fc8d65606632f5 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 09:07:51 -0500 Subject: [PATCH] Fixup ProtocolConstants diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java -index 5d0a3f65..ff1f28aa 100644 +index 4ba561a4..c34f6fa2 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java -@@ -56,6 +56,16 @@ public class ProtocolConstants - ProtocolConstants.MINECRAFT_1_14_4 +@@ -59,6 +59,16 @@ public class ProtocolConstants + ProtocolConstants.MINECRAFT_1_15 ); + public static final boolean isBeforeOrEq(int before, int other) @@ -26,5 +26,5 @@ index 5d0a3f65..ff1f28aa 100644 { -- -2.21.0 (Apple Git-120) +2.24.0 diff --git a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch index 247011a..a6e7c51 100644 --- a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch +++ b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch @@ -1,4 +1,4 @@ -From 711534132b55ac51ac7522e17415ad181110282c Mon Sep 17 00:00:00 2001 +From 6559583460588cb30d956d9db8eae834eb2a9ef5 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 19 May 2016 17:09:22 -0600 Subject: [PATCH] Allow invalid packet ids for forge servers @@ -37,10 +37,10 @@ index ea44573d..5b32effe 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 0e6cac95..d599eef3 100644 +index 8c99ee85..31cbaa53 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 -@@ -392,14 +392,23 @@ public enum Protocol +@@ -410,14 +410,23 @@ public enum Protocol return protocol; } @@ -66,7 +66,7 @@ index 0e6cac95..d599eef3 100644 throw new BadPacketException( "Packet with id " + id + " outside of range " ); } diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index ac54ff74..e32a06c2 100644 +index cf397206..8cdd3f98 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -31,7 +31,9 @@ import net.md_5.bungee.forge.ForgeUtils; @@ -105,10 +105,10 @@ index e5a63541..644522b1 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 3b469ab9..bd2bea7c 100644 +index ff59c824..298a99be 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 -@@ -315,6 +315,12 @@ public abstract class EntityMap +@@ -317,6 +317,12 @@ public abstract class EntityMap int packetId = DefinedPacket.readVarInt( packet ); int packetIdLength = packet.readerIndex() - readerIndex; @@ -122,5 +122,5 @@ index 3b469ab9..bd2bea7c 100644 { rewriteInt( packet, oldId, newId, readerIndex + packetIdLength ); -- -2.21.0 (Apple Git-120) +2.24.0 diff --git a/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch b/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch index be790ec..3a67e6e 100644 --- a/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch +++ b/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch @@ -1,4 +1,4 @@ -From 98c28b0323fc82e0b66defb47898c1bf7d8abacd Mon Sep 17 00:00:00 2001 +From 87d20245a793e386d85bfcf181701da0d9847d18 Mon Sep 17 00:00:00 2001 From: Aaron Hill 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 39e257c3..e4f14974 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 d599eef3..87093807 100644 +index 31cbaa53..3556eda0 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.Commands; @@ -45,9 +45,9 @@ index d599eef3..87093807 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; -@@ -92,6 +94,27 @@ public enum Protocol - BossBar.class, - map( ProtocolConstants.MINECRAFT_1_9, 0x0C ) +@@ -97,6 +99,29 @@ public enum Protocol + map( ProtocolConstants.MINECRAFT_1_9, 0x0C ), + map( ProtocolConstants.MINECRAFT_1_15, 0x0D ) ); + // Waterfall start + TO_CLIENT.registerPacket( @@ -58,7 +58,8 @@ index d599eef3..87093807 100644 + map(ProtocolConstants.MINECRAFT_1_12, 0x4E), + map(ProtocolConstants.MINECRAFT_1_12_1, 0x4F), + map(ProtocolConstants.MINECRAFT_1_13, 0x53), -+ map(ProtocolConstants.MINECRAFT_1_14, 0x59) ++ map(ProtocolConstants.MINECRAFT_1_14, 0x59), ++ map(ProtocolConstants.MINECRAFT_1_15, 0x5A) + ); + TO_CLIENT.registerPacket( + EntityRemoveEffect.class, @@ -67,7 +68,8 @@ index d599eef3..87093807 100644 + map(ProtocolConstants.MINECRAFT_1_12, 0x32), + map(ProtocolConstants.MINECRAFT_1_12_1, 0x33), + map(ProtocolConstants.MINECRAFT_1_13, 0x36), -+ map(ProtocolConstants.MINECRAFT_1_14, 0x38) ++ map(ProtocolConstants.MINECRAFT_1_14, 0x38), ++ map(ProtocolConstants.MINECRAFT_1_15, 0x39) + ); + // Waterfall end TO_CLIENT.registerPacket( diff --git a/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch index 95d36d7..a928964 100644 --- a/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch +++ b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch @@ -1,4 +1,4 @@ -From 0e88d1a3be4a4d500bf6ce78100a066252ded0b0 Mon Sep 17 00:00:00 2001 +From 0eba7da12fc8c161aa50d07bfcd616a8acbede73 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 14 Jan 2019 03:35:21 +0000 Subject: [PATCH] Provide an option to disable entity metadata rewriting @@ -57,7 +57,7 @@ index 4ff8da6d..e860214f 100644 + } } diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index c2b1de82..72f487dc 100644 +index 7aa792a2..00cd477f 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -226,7 +226,7 @@ public class ServerConnector extends PacketHandler @@ -85,17 +85,18 @@ index c2b1de82..72f487dc 100644 serverScoreboard.clear(); for ( UUID bossbar : user.getSentBossBars() ) -@@ -285,12 +287,32 @@ public class ServerConnector extends PacketHandler +@@ -285,12 +287,33 @@ public class ServerConnector extends PacketHandler user.unsafe().sendPacket( new EntityStatus( user.getClientEntityId(), login.isReducedDebugInfo() ? EntityStatus.DEBUG_INFO_REDUCED : EntityStatus.DEBUG_INFO_NORMAL ) ); user.setDimensionChange( true ); - if ( login.getDimension() == user.getDimension() ) + if ( !user.isDisableEntityMetadataRewrite() && login.getDimension() == user.getDimension() ) // Waterfall - defer { - user.unsafe().sendPacket( new Respawn( ( login.getDimension() >= 0 ? -1 : 0 ), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) ); + user.unsafe().sendPacket( new Respawn( ( login.getDimension() >= 0 ? -1 : 0 ), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) ); } user.setServerEntityId( login.getEntityId() ); ++ + // Waterfall start + if ( user.isDisableEntityMetadataRewrite() ) { + // Ensure that we maintain consistency @@ -103,20 +104,20 @@ index c2b1de82..72f487dc 100644 + + // Only send if we are not in the same dimension + if (user.getDimension() != login.getDimension()) { -+ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getDifficulty(), login.getGameMode(), login.getLevelType())); ++ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType())); + } + -+ Login modLogin = new Login( login.getEntityId(),login.getGameMode(), login.getDimension(), -+ login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo() ); ++ Login modLogin = new Login( login.getEntityId(),login.getGameMode(), login.getDimension(), login.getSeed(), ++ login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn() ); + user.unsafe().sendPacket(modLogin); + + // Only send if we're in the same dimension + if (user.getDimension() == login.getDimension()) { -+ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getDifficulty(), login.getGameMode(), login.getLevelType())); ++ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType())); + } + } + // Waterfall end - user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) ); + user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) ); if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 ) { diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -155,7 +156,7 @@ index fd14f518..fba84905 100644 } 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 bd2bea7c..324a7741 100644 +index 298a99be..e5d566bd 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 @@ -8,6 +8,7 @@ import io.netty.buffer.ByteBufInputStream; @@ -178,7 +179,7 @@ index bd2bea7c..324a7741 100644 switch ( version ) { case ProtocolConstants.MINECRAFT_1_8: -@@ -275,7 +281,13 @@ public abstract class EntityMap +@@ -277,7 +283,13 @@ public abstract class EntityMap DefinedPacket.readVarInt( packet ); break; default: diff --git a/BungeeCord-Patches/0053-Speed-up-packet-construction.patch b/BungeeCord-Patches/0053-Speed-up-packet-construction.patch index d417eea..d0af8f3 100644 --- a/BungeeCord-Patches/0053-Speed-up-packet-construction.patch +++ b/BungeeCord-Patches/0053-Speed-up-packet-construction.patch @@ -1,11 +1,11 @@ -From 05d153a18c69bacd5fe495a3bacd8065924bf95f Mon Sep 17 00:00:00 2001 +From cc895993a4408d955ec341c456e9a9578711836e Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 17 Apr 2019 09:24:38 +0300 Subject: [PATCH] Speed up packet construction 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 87093807..f55b846a 100644 +index 3556eda0..44dc34ff 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 @@ -53,6 +53,7 @@ public enum Protocol @@ -24,21 +24,23 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x00 ), map( ProtocolConstants.MINECRAFT_1_9, 0x1F ), map( ProtocolConstants.MINECRAFT_1_13, 0x21 ), -@@ -71,18 +73,21 @@ public enum Protocol +@@ -72,6 +74,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( Login.class, + Login::new, // Waterfall - speed up packet construction map( ProtocolConstants.MINECRAFT_1_8, 0x01 ), map( ProtocolConstants.MINECRAFT_1_9, 0x23 ), - map( ProtocolConstants.MINECRAFT_1_13, 0x25 ) + map( ProtocolConstants.MINECRAFT_1_13, 0x25 ), +@@ -79,6 +82,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( Chat.class, + Chat::new, // Waterfall - speed up packet construction map( ProtocolConstants.MINECRAFT_1_8, 0x02 ), map( ProtocolConstants.MINECRAFT_1_9, 0x0F ), - map( ProtocolConstants.MINECRAFT_1_13, 0x0E ) + map( ProtocolConstants.MINECRAFT_1_13, 0x0E ), +@@ -86,6 +90,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( Respawn.class, @@ -46,12 +48,13 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x07 ), map( ProtocolConstants.MINECRAFT_1_9, 0x33 ), map( ProtocolConstants.MINECRAFT_1_12, 0x34 ), -@@ -92,11 +97,13 @@ public enum Protocol +@@ -96,12 +101,14 @@ public enum Protocol ); TO_CLIENT.registerPacket( BossBar.class, + BossBar::new, // Waterfall - speed up packet construction - map( ProtocolConstants.MINECRAFT_1_9, 0x0C ) + map( ProtocolConstants.MINECRAFT_1_9, 0x0C ), + map( ProtocolConstants.MINECRAFT_1_15, 0x0D ) ); // Waterfall start TO_CLIENT.registerPacket( @@ -60,7 +63,7 @@ index 87093807..f55b846a 100644 map(ProtocolConstants.MINECRAFT_1_8, 0x1D), map(ProtocolConstants.MINECRAFT_1_9, 0x4C), map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B), -@@ -107,6 +114,7 @@ public enum Protocol +@@ -113,6 +120,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( EntityRemoveEffect.class, @@ -68,7 +71,7 @@ index 87093807..f55b846a 100644 map(ProtocolConstants.MINECRAFT_1_8, 0x1E), map(ProtocolConstants.MINECRAFT_1_9, 0x31), map(ProtocolConstants.MINECRAFT_1_12, 0x32), -@@ -117,6 +125,7 @@ public enum Protocol +@@ -124,6 +132,7 @@ public enum Protocol // Waterfall end TO_CLIENT.registerPacket( PlayerListItem.class, // PlayerInfo @@ -76,14 +79,15 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x38 ), map( ProtocolConstants.MINECRAFT_1_9, 0x2D ), map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ), -@@ -125,12 +134,14 @@ public enum Protocol +@@ -133,6 +142,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( TabCompleteResponse.class, + TabCompleteResponse::new, // Waterfall - speed up packet construction map( ProtocolConstants.MINECRAFT_1_8, 0x3A ), map( ProtocolConstants.MINECRAFT_1_9, 0x0E ), - map( ProtocolConstants.MINECRAFT_1_13, 0x10 ) + map( ProtocolConstants.MINECRAFT_1_13, 0x10 ), +@@ -140,6 +150,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( ScoreboardObjective.class, @@ -91,7 +95,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x3B ), map( ProtocolConstants.MINECRAFT_1_9, 0x3F ), map( ProtocolConstants.MINECRAFT_1_12, 0x41 ), -@@ -140,6 +151,7 @@ public enum Protocol +@@ -150,6 +161,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( ScoreboardScore.class, @@ -99,7 +103,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x3C ), map( ProtocolConstants.MINECRAFT_1_9, 0x42 ), map( ProtocolConstants.MINECRAFT_1_12, 0x44 ), -@@ -149,6 +161,7 @@ public enum Protocol +@@ -160,6 +172,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( ScoreboardDisplay.class, @@ -107,7 +111,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x3D ), map( ProtocolConstants.MINECRAFT_1_9, 0x38 ), map( ProtocolConstants.MINECRAFT_1_12, 0x3A ), -@@ -158,6 +171,7 @@ public enum Protocol +@@ -170,6 +183,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( Team.class, @@ -115,7 +119,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x3E ), map( ProtocolConstants.MINECRAFT_1_9, 0x41 ), map( ProtocolConstants.MINECRAFT_1_12, 0x43 ), -@@ -167,6 +181,7 @@ public enum Protocol +@@ -180,6 +194,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( PluginMessage.class, @@ -123,7 +127,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x3F ), map( ProtocolConstants.MINECRAFT_1_9, 0x18 ), map( ProtocolConstants.MINECRAFT_1_13, 0x19 ), -@@ -174,6 +189,7 @@ public enum Protocol +@@ -188,6 +203,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( Kick.class, @@ -131,7 +135,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x40 ), map( ProtocolConstants.MINECRAFT_1_9, 0x1A ), map( ProtocolConstants.MINECRAFT_1_13, 0x1B ), -@@ -181,6 +197,7 @@ public enum Protocol +@@ -196,6 +212,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( Title.class, @@ -139,7 +143,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x45 ), map( ProtocolConstants.MINECRAFT_1_12, 0x47 ), map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ), -@@ -189,6 +206,7 @@ public enum Protocol +@@ -205,6 +222,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( PlayerListHeaderFooter.class, @@ -147,7 +151,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x47 ), map( ProtocolConstants.MINECRAFT_1_9, 0x48 ), map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ), -@@ -199,6 +217,7 @@ public enum Protocol +@@ -216,6 +234,7 @@ public enum Protocol ); TO_CLIENT.registerPacket( EntityStatus.class, @@ -155,17 +159,19 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x1A ), map( ProtocolConstants.MINECRAFT_1_9, 0x1B ), map( ProtocolConstants.MINECRAFT_1_13, 0x1C ), -@@ -206,15 +225,18 @@ public enum Protocol +@@ -224,17 +243,20 @@ public enum Protocol ); TO_CLIENT.registerPacket( Commands.class, + Commands::new, // Waterfall - speed up packet construction - map( ProtocolConstants.MINECRAFT_1_13, 0x11 ) + map( ProtocolConstants.MINECRAFT_1_13, 0x11 ), + map( ProtocolConstants.MINECRAFT_1_15, 0x12 ) ); TO_CLIENT.registerPacket( ViewDistance.class, + ViewDistance::new, // Waterfall - speed up packet construction - map( ProtocolConstants.MINECRAFT_1_14, 0x41 ) + map( ProtocolConstants.MINECRAFT_1_14, 0x41 ), + map( ProtocolConstants.MINECRAFT_1_15, 0x42 ) ); TO_SERVER.registerPacket( @@ -174,7 +180,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x00 ), map( ProtocolConstants.MINECRAFT_1_9, 0x0B ), map( ProtocolConstants.MINECRAFT_1_12, 0x0C ), -@@ -224,6 +246,7 @@ public enum Protocol +@@ -244,6 +266,7 @@ public enum Protocol ); TO_SERVER.registerPacket( Chat.class, @@ -182,7 +188,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x01 ), map( ProtocolConstants.MINECRAFT_1_9, 0x02 ), map( ProtocolConstants.MINECRAFT_1_12, 0x03 ), -@@ -232,6 +255,7 @@ public enum Protocol +@@ -252,6 +275,7 @@ public enum Protocol ); TO_SERVER.registerPacket( TabCompleteRequest.class, @@ -190,7 +196,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x14 ), map( ProtocolConstants.MINECRAFT_1_9, 0x01 ), map( ProtocolConstants.MINECRAFT_1_12, 0x02 ), -@@ -241,6 +265,7 @@ public enum Protocol +@@ -261,6 +285,7 @@ public enum Protocol ); TO_SERVER.registerPacket( ClientSettings.class, @@ -198,7 +204,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x15 ), map( ProtocolConstants.MINECRAFT_1_9, 0x04 ), map( ProtocolConstants.MINECRAFT_1_12, 0x05 ), -@@ -249,6 +274,7 @@ public enum Protocol +@@ -269,6 +294,7 @@ public enum Protocol ); TO_SERVER.registerPacket( PluginMessage.class, @@ -206,7 +212,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x17 ), map( ProtocolConstants.MINECRAFT_1_9, 0x09 ), map( ProtocolConstants.MINECRAFT_1_12, 0x0A ), -@@ -265,19 +291,23 @@ public enum Protocol +@@ -285,19 +311,23 @@ public enum Protocol { TO_CLIENT.registerPacket( StatusResponse.class, @@ -230,7 +236,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_8, 0x01 ) ); } -@@ -289,35 +319,43 @@ public enum Protocol +@@ -309,35 +339,43 @@ public enum Protocol { TO_CLIENT.registerPacket( Kick.class, @@ -274,7 +280,7 @@ index 87093807..f55b846a 100644 map( ProtocolConstants.MINECRAFT_1_13, 0x02 ) ); } -@@ -368,7 +406,7 @@ public enum Protocol +@@ -388,7 +426,7 @@ public enum Protocol private final int protocolVersion; private final TObjectIntMap> packetMap = new TObjectIntHashMap<>( MAX_PACKET_ID ); @@ -283,7 +289,7 @@ index 87093807..f55b846a 100644 } @Data -@@ -436,21 +474,24 @@ public enum Protocol +@@ -456,21 +494,24 @@ public enum Protocol throw new BadPacketException( "Packet with id " + id + " outside of range " ); } @@ -312,7 +318,7 @@ index 87093807..f55b846a 100644 int mappingIndex = 0; ProtocolMapping mapping = mappings[mappingIndex]; -@@ -479,11 +520,32 @@ public enum Protocol +@@ -499,11 +540,32 @@ public enum Protocol data.packetMap.put( packetClass, mapping.packetID ); data.packetConstructors[mapping.packetID] = constructor; }