diff options
| author | Jake Potrebic <[email protected]> | 2023-11-11 12:25:45 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-11 12:25:45 -0800 |
| commit | d8847bc1f3a77be9edf69a6b5b71fbfd8292eb57 (patch) | |
| tree | 1ae03a5eaa4b4106a86df39097acb787f2ef059d /patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch | |
| parent | 63e77b531da93e74fe08851aa8f3892984fdec44 (diff) | |
| download | Paper-d8847bc1f3a77be9edf69a6b5b71fbfd8292eb57.tar.gz Paper-d8847bc1f3a77be9edf69a6b5b71fbfd8292eb57.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#9922)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
fde5602a PR-927: Add PlayerRecipeBookSettingsChangeEvent
949ff217 PR-930: Add methods to get/set evoker fang attack delay
f6f7c79d SPIGOT-7514, PR-929: Add "Enchantment Roll" API to enchant items according to Minecraft mechanics
d40e22da PR-712: Add API to get full result of crafting items
CraftBukkit Changes:
c8feb0629 PR-1291: Improve precondition message in Entity#playEffect
482c56a00 PR-1285: Add PlayerRecipeBookSettingsChangeEvent
cdf798800 PR-1290: Add methods to get/set evoker fang attack delay
2c1b5f78f SPIGOT-7514, PR-1289: Add "Enchantment Roll" API to enchant items according to Minecraft mechanics
6aa644ae9 PR-992: Add API to get full result of crafting items
ffb1319bc PR-1287: Fix scoreboards not updating in Player#setStatistic
Diffstat (limited to 'patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch')
| -rw-r--r-- | patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch index 160440f8ce..abfd6ed5e9 100644 --- a/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch @@ -50,10 +50,10 @@ index a0328cfbe4184a2c1dc895e96fa3fefbdc52bf09..598f807f0d0caac98b81e0e2991f1bd4 MinecraftServer minecraftserver = this.server; Connection networkmanager = this.connection; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c38d6ff1c4b22833ce8c99ec420741659becf4d2..eabdaf85e904224f936154d415d183ba65e4dbbf 100644 +index cc099315b7ecd471d363679d39ca802692b8f962..c885f3dea2ef128758da59acba42765887ae41ee 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1855,6 +1855,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1856,6 +1856,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void onDisconnect(Component reason) { @@ -66,7 +66,7 @@ index c38d6ff1c4b22833ce8c99ec420741659becf4d2..eabdaf85e904224f936154d415d183ba // CraftBukkit start - Rarely it would send a disconnect line twice if (this.processedDisconnect) { return; -@@ -1863,11 +1869,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1864,11 +1870,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } // CraftBukkit end ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString()); @@ -86,7 +86,7 @@ index c38d6ff1c4b22833ce8c99ec420741659becf4d2..eabdaf85e904224f936154d415d183ba this.chatMessageChain.close(); // CraftBukkit start - Replace vanilla quit message handling with our own. /* -@@ -1877,7 +1889,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1878,7 +1890,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.player.disconnect(); // Paper start - Adventure |