64 lines
5.1 KiB
Diff
64 lines
5.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
||
|
|
Date: Sat, 14 Nov 2020 16:19:52 +0100
|
||
|
|
Subject: [PATCH] Add API for quit reason
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
|
||
|
|
index 878f879f8d410c428ad8a4c49e0c86c559bc47a9..f86f430598026a3a7e27fb8d40cfc5fe7b9b845d 100644
|
||
|
|
--- a/src/main/java/net/minecraft/network/NetworkManager.java
|
||
|
|
+++ b/src/main/java/net/minecraft/network/NetworkManager.java
|
||
|
|
@@ -137,12 +137,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
||
|
|
|
||
|
|
this.u = true;
|
||
|
|
if (this.channel.isOpen()) {
|
||
|
|
+ EntityPlayer player = this.getPlayer(); // Paper
|
||
|
|
if (throwable instanceof TimeoutException) {
|
||
|
|
NetworkManager.LOGGER.debug("Timeout", throwable);
|
||
|
|
+ if (player != null) player.quitReason = org.bukkit.event.player.PlayerQuitEvent.QuitReason.TIMED_OUT; // Paper
|
||
|
|
this.close(new ChatMessage("disconnect.timeout"));
|
||
|
|
} else {
|
||
|
|
ChatMessage chatmessage = new ChatMessage("disconnect.genericReason", new Object[]{"Internal Exception: " + throwable});
|
||
|
|
|
||
|
|
+ if (player != null) player.quitReason = org.bukkit.event.player.PlayerQuitEvent.QuitReason.ERRONEOUS_STATE; // Paper
|
||
|
|
if (flag) {
|
||
|
|
NetworkManager.LOGGER.debug("Failed to sent packet", throwable);
|
||
|
|
this.sendPacket(new PacketPlayOutKickDisconnect(chatmessage), (future) -> {
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
index 3908dc27a5cf127ab3c3630da47318da1bf4e3c9..78fcb90c86700ee6feef0d40753fc8d8a943777f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
@@ -261,6 +261,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||
|
|
double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
|
||
|
|
|
||
|
|
boolean needsChunkCenterUpdate; // Paper - no-tick view distance
|
||
|
|
+ public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
|
||
|
|
|
||
|
|
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
|
||
|
|
super(worldserver, worldserver.getSpawn(), worldserver.v(), gameprofile);
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
index 73a1730f1c683b2345a9c3d4f2288ceab20a6625..cf81710e41420f6cd027231998ebf5305f23f3d5 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
@@ -449,6 +449,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||
|
|
final IChatBaseComponent ichatbasecomponent = PaperAdventure.asVanilla(event.reason()); // Paper - Adventure
|
||
|
|
// CraftBukkit end
|
||
|
|
|
||
|
|
+ this.player.quitReason = org.bukkit.event.player.PlayerQuitEvent.QuitReason.KICKED; // Paper
|
||
|
|
this.networkManager.sendPacket(new PacketPlayOutKickDisconnect(ichatbasecomponent), (future) -> {
|
||
|
|
this.networkManager.close(ichatbasecomponent);
|
||
|
|
});
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
index 8bd55e3d2b5142081a7dfe1dbbd36f2f995e5856..e0bbb7f3ea7ce4902cd14e64357472087ce6912a 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -590,7 +590,7 @@ public abstract class PlayerList {
|
||
|
|
entityplayer.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
- PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(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.getName())));
|
||
|
|
+ PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(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.getName())), entityplayer.quitReason); // Paper - quit reason
|
||
|
|
if (entityplayer.didPlayerJoinEvent) cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
|
||
|
|
entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
|
||
|
|
|