Add config option for displayname in quit message (#5260)

This restores the behaviour to vanilla by default, but may be changed if
one wants to.

Fixes #5259.
This commit is contained in:
Mariell Hoversholm
2021-02-26 18:54:48 +01:00
committed by GitHub
parent 63fe5e4b77
commit 2dd5dccf00
33 changed files with 98 additions and 84 deletions

View File

@@ -117,7 +117,7 @@ index cb9257d66a28ddd30c5e54808c044cd1e10b8a4a..fb121524f0505baf65d0ed3cb6db7cbd
this.player.o();
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 30acb3cd9381bab2932a0679dc496e8b1ed65d94..ed3490b00ec03feefa403c757ebe8d889ed5cd63 100644
index 57955b39fccc9642499445f07c10a55c7f8eacc7..1dfc6476593aeff1d867f8598a843b67f24d5207 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -423,7 +423,7 @@ public abstract class PlayerList {
@@ -128,7 +128,7 @@ index 30acb3cd9381bab2932a0679dc496e8b1ed65d94..ed3490b00ec03feefa403c757ebe8d88
+ 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, entityplayer.getBukkitEntity().displayName()));
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())));
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d192e341f0f6a3d03329dab16de3b19962091d2a..1a2760552cd42b302d4604917daf1fcd23765e59 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java