2021-07-09 21:03:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 7 Jul 2021 16:19:41 -0700
2024-01-19 13:22:30 +01:00
Subject: [PATCH] Fix kick event leave message not being sent
2021-07-09 21:03:28 +02:00
2022-03-16 16:57:51 +01:00
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
2024-01-21 12:11:43 +01:00
index 61d439af863603c669c45f38045dbad9068f285a..ade79a794a7485e0141a430d62236daf1e566b21 100644
2022-03-16 16:57:51 +01:00
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
2023-12-06 04:57:46 +01:00
@@ -273,7 +273,6 @@ public class ServerPlayer extends Player {
2023-09-22 09:24:44 +02:00
public boolean joining = true;
2022-12-19 11:46:55 +01:00
public boolean sentListPacket = false;
2024-01-21 12:11:43 +01:00
public boolean supressTrackerForLogin = false; // Paper - Fire PlayerJoinEvent when Player is actually ready
2022-03-16 16:57:51 +01:00
- public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
// CraftBukkit end
2022-12-07 21:16:54 +01:00
public boolean isRealPlayer; // Paper
2023-06-08 04:04:01 +02:00
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
2023-09-22 13:39:00 +02:00
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
2024-01-21 12:11:43 +01:00
index 3049377685ee4fe75f0c4b68eab39a916ac20785..f5f2d65d2e02b0d79352585d9d4ef588ab59dce7 100644
2023-09-22 13:39:00 +02:00
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
2023-12-25 11:51:44 +01:00
@@ -77,6 +77,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
2023-09-22 13:39:00 +02:00
@Override
public void onDisconnect(Component reason) {
2024-01-19 13:22:30 +01:00
+ // Paper start - Fix kick event leave message not being sent
2023-09-22 13:39:00 +02:00
+ this.onDisconnect(reason, null);
+ }
+ public void onDisconnect(Component reason, @Nullable net.kyori.adventure.text.Component quitMessage) {
2024-01-19 13:22:30 +01:00
+ // Paper end - Fix kick event leave message not being sent
2023-09-22 13:39:00 +02:00
if (this.isSingleplayerOwner()) {
ServerCommonPacketListenerImpl.LOGGER.info("Stopping singleplayer server as player logged out");
this.server.halt(false);
2023-12-25 11:51:44 +01:00
@@ -320,7 +325,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
2023-09-22 13:39:00 +02:00
// Do not kick the player
return;
}
- this.player.kickLeaveMessage = event.getLeaveMessage(); // CraftBukkit - SPIGOT-3034: Forward leave message to PlayerQuitEvent
// Send the possibly modified leave message
final Component ichatbasecomponent = io.papermc.paper.adventure.PaperAdventure.asVanilla(event.reason()); // Paper - Adventure
// CraftBukkit end
2023-12-25 11:51:44 +01:00
@@ -329,7 +333,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
2023-09-22 13:39:00 +02:00
this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), PacketSendListener.thenRun(() -> {
this.connection.disconnect(ichatbasecomponent);
}));
- this.onDisconnect(ichatbasecomponent); // CraftBukkit - fire quit instantly
2023-09-22 13:42:04 +02:00
+ this.onDisconnect(ichatbasecomponent, event.leaveMessage()); // CraftBukkit - fire quit instantly // Paper - use kick event leave message
2023-09-22 13:39:00 +02:00
this.connection.setReadOnly();
MinecraftServer minecraftserver = this.server;
Connection networkmanager = this.connection;
2021-07-09 21:03:28 +02:00
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2024-01-21 12:11:43 +01:00
index 5dfebe60caa47af3bab4a667ca5d0b6438367161..fe8ba3890d5b21273aca68777de56d7f7f644c0d 100644
2021-07-09 21:03:28 +02:00
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2024-01-20 12:50:16 +01:00
@@ -1882,6 +1882,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2021-07-09 21:03:28 +02:00
@Override
public void onDisconnect(Component reason) {
2024-01-19 13:22:30 +01:00
+ // Paper start - Fix kick event leave message not being sent
2021-07-09 21:03:28 +02:00
+ this.onDisconnect(reason, null);
+ }
2023-09-22 13:39:00 +02:00
+ @Override
2021-07-09 21:03:28 +02:00
+ public void onDisconnect(Component reason, @Nullable net.kyori.adventure.text.Component quitMessage) {
2024-01-19 13:22:30 +01:00
+ // Paper end - Fix kick event leave message not being sent
2021-07-09 21:03:28 +02:00
// CraftBukkit start - Rarely it would send a disconnect line twice
if (this.processedDisconnect) {
return;
2024-01-20 12:50:16 +01:00
@@ -1890,11 +1896,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2023-09-22 09:24:44 +02:00
}
// CraftBukkit end
ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString());
- this.removePlayerFromWorld();
2023-09-26 22:16:21 +02:00
- super.onDisconnect(reason);
2024-01-19 13:22:30 +01:00
+ this.removePlayerFromWorld(quitMessage); // Paper - Fix kick event leave message not being sent
+ super.onDisconnect(reason, quitMessage); // Paper - Fix kick event leave message not being sent
2023-09-22 09:24:44 +02:00
}
2024-01-19 13:22:30 +01:00
+ // Paper start - Fix kick event leave message not being sent
2023-09-22 09:24:44 +02:00
private void removePlayerFromWorld() {
+ this.removePlayerFromWorld(null);
+ }
+
+ private void removePlayerFromWorld(@Nullable net.kyori.adventure.text.Component quitMessage) {
2024-01-19 13:22:30 +01:00
+ // Paper end - Fix kick event leave message not being sent
2023-09-22 09:24:44 +02:00
this.chatMessageChain.close();
// CraftBukkit start - Replace vanilla quit message handling with our own.
/*
2024-01-20 12:50:16 +01:00
@@ -1904,7 +1916,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2021-07-09 21:03:28 +02:00
this.player.disconnect();
// Paper start - Adventure
2021-11-25 00:46:26 +01:00
- 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
2021-07-09 21:03:28 +02:00
if ((quitMessage != null) && !quitMessage.equals(net.kyori.adventure.text.Component.empty())) {
2022-07-27 23:19:52 +02:00
this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
2021-07-09 21:03:28 +02:00
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
2024-01-21 12:11:43 +01:00
index 0f04b29ff000c0b0f0692eecf26675f5520d9e07..3f8f7d7db41b73d0d449b653d3ba55a097c00566 100644
2021-07-09 21:03:28 +02:00
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
2023-12-06 04:57:46 +01:00
@@ -570,6 +570,11 @@ public abstract class PlayerList {
2021-07-09 21:03:28 +02:00
}
2023-06-08 04:04:01 +02:00
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer) { // CraftBukkit - return string // Paper - return Component
2024-01-19 13:22:30 +01:00
+ // Paper start - Fix kick event leave message not being sent
2023-09-22 19:31:02 +02:00
+ return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(entityplayer.getDisplayName())));
2021-07-09 21:03:28 +02:00
+ }
2021-11-25 00:46:26 +01:00
+ public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
2024-01-19 13:22:30 +01:00
+ // Paper end - Fix kick event leave message not being sent
2023-06-08 04:04:01 +02:00
ServerLevel worldserver = entityplayer.serverLevel();
2021-07-09 21:03:28 +02:00
entityplayer.awardStat(Stats.LEAVE_GAME);