aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch')
-rw-r--r--patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
new file mode 100644
index 0000000000..316e9e0de5
--- /dev/null
+++ b/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Wed, 7 Jul 2021 16:19:41 -0700
+Subject: [PATCH] Fixes kick event leave message not being sent
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index a11647ab2b75870c6d7366260865c261e5cfd52d..aaa1466c420e346d20aace4115f2d83cb9fb2d0b 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -455,7 +455,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+ this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), (future) -> {
+ this.connection.disconnect(ichatbasecomponent);
+ });
+- this.onDisconnect(ichatbasecomponent); // CraftBukkit - fire quit instantly
++ this.onDisconnect(ichatbasecomponent, event.leaveMessage()); // CraftBukkit - fire quit instantly // Paper - use kick event leave message
+ this.connection.setReadOnly();
+ MinecraftServer minecraftserver = this.server;
+ Connection networkmanager = this.connection;
+@@ -1904,6 +1904,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+
+ @Override
+ public void onDisconnect(Component reason) {
++ // Paper start
++ this.onDisconnect(reason, null);
++ }
++ public void onDisconnect(Component reason, @Nullable net.kyori.adventure.text.Component quitMessage) {
++ // Paper end
+ // CraftBukkit start - Rarely it would send a disconnect line twice
+ if (this.processedDisconnect) {
+ return;
+@@ -1920,7 +1925,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+
+ this.player.disconnect();
+ // Paper start - Adventure
+- net.kyori.adventure.text.Component quitMessage = this.server.getPlayerList().remove(this.player);
++ quitMessage = quitMessage == null ? this.server.getPlayerList().remove(this.player) : this.server.getPlayerList().remove(this.player, quitMessage); // Paper - pass in quitMessage to fix kick message not being used
+ if ((quitMessage != null) && !quitMessage.equals(net.kyori.adventure.text.Component.empty())) {
+ this.server.getPlayerList().broadcastMessage(PaperAdventure.asVanilla(quitMessage), ChatType.SYSTEM, Util.NIL_UUID);
+ // Paper end
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index ee139c746328fcff67b1ee75629dbee0dd547fed..88820ba073e89638304b26e52a39a426f76fb2e9 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -591,6 +591,11 @@ public abstract class PlayerList {
+ }
+
+ public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer) { // Paper - return Component
++ // Paper start
++ return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, com.destroystokyo.paper.PaperConfig.useDisplayNameInQuit ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName())));
++ }
++ public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
++ // Paper end
+ ServerLevel worldserver = entityplayer.getLevel();
+
+ entityplayer.awardStat(Stats.LEAVE_GAME);
+@@ -601,7 +606,7 @@ public abstract class PlayerList {
+ entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
+ }
+
+- PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, com.destroystokyo.paper.PaperConfig.useDisplayNameInQuit ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName())), entityplayer.quitReason); // Paper - quit reason
++ PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), leaveMessage, entityplayer.quitReason); // Paper - quit reason
+ if (entityplayer.didPlayerJoinEvent) this.cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
+ entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
+