66 lines
4.7 KiB
Diff
66 lines
4.7 KiB
Diff
|
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
|
||
|
|
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 6ff04fc7202a7eb1f2b5978a2e2a573945d9dde1..c42aca2c8e0631e4091fac6652c4f1e5968a7b63 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
@@ -457,7 +457,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;
|
||
|
|
@@ -1851,6 +1851,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;
|
||
|
|
@@ -1867,7 +1872,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||
|
|
|
||
|
|
this.player.disconnect();
|
||
|
|
// Paper start - Adventure
|
||
|
|
- net.kyori.adventure.text.Component quitMessage = this.server.getPlayerList().disconnect(this.player);
|
||
|
|
+ quitMessage = quitMessage == null ? this.server.getPlayerList().disconnect(this.player) : this.server.getPlayerList().disconnect(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 65657c009f6d5a5d5740e80f912a5893333c7085..48045993c8ad4b014cf4a67f7c4db42e014d1c81 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -587,6 +587,11 @@ public abstract class PlayerList {
|
||
|
|
}
|
||
|
|
|
||
|
|
public net.kyori.adventure.text.Component disconnect(ServerPlayer entityplayer) { // Paper - return Component
|
||
|
|
+ // Paper start
|
||
|
|
+ return this.disconnect(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 disconnect(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
|
||
|
|
+ // Paper end
|
||
|
|
ServerLevel worldserver = entityplayer.getLevel();
|
||
|
|
|
||
|
|
entityplayer.awardStat(Stats.LEAVE_GAME);
|
||
|
|
@@ -597,7 +602,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());
|
||
|
|
|