aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0540-Incremental-player-saving.patch
diff options
context:
space:
mode:
authorMariell Hoversholm <[email protected]>2021-02-26 18:54:48 +0100
committerGitHub <[email protected]>2021-02-26 17:54:48 +0000
commit2dd5dccf0026b24e993394c97d08d6891e44f9bc (patch)
treeda99f4cd8a593c2c288e4855160ca0d1479f96de /Spigot-Server-Patches/0540-Incremental-player-saving.patch
parent63fe5e4b7749a3a6996727ba2c4435d3f66fdd3d (diff)
downloadPaper-2dd5dccf0026b24e993394c97d08d6891e44f9bc.tar.gz
Paper-2dd5dccf0026b24e993394c97d08d6891e44f9bc.zip
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.
Diffstat (limited to 'Spigot-Server-Patches/0540-Incremental-player-saving.patch')
-rw-r--r--Spigot-Server-Patches/0540-Incremental-player-saving.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0540-Incremental-player-saving.patch b/Spigot-Server-Patches/0540-Incremental-player-saving.patch
index eb48e4fec2..da86ebc6e5 100644
--- a/Spigot-Server-Patches/0540-Incremental-player-saving.patch
+++ b/Spigot-Server-Patches/0540-Incremental-player-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Incremental player saving
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fd3b4a01c84da110d41b7224ebb38ae78b389f79..deb77934dcba8c9209c942a6521dd8486cb5a48d 100644
+index b67ba8f75e4a3358d7c2462918b85b0bf9b5a922..fdbd8b89bb8bf3b61f60b812b90483c98a3d5ccb 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -435,4 +435,15 @@ public class PaperConfig {
+@@ -440,4 +440,15 @@ public class PaperConfig {
allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false));
set("settings.unsupported-settings.allow-tnt-duplication", null);
}
@@ -25,7 +25,7 @@ index fd3b4a01c84da110d41b7224ebb38ae78b389f79..deb77934dcba8c9209c942a6521dd848
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index dbc9cc0728d1f9de89e15ecf5ccd6f8b07cd0788..7e5e4acb3c892a5d366e0fbfb76b97884345ec24 100644
+index a7f39878829f1c901934fb2d8b53d906295112e9..8436b7be989bf08c8ec1f0d646b20e777a0ebd55 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -45,6 +45,7 @@ import org.bukkit.inventory.MainHand;
@@ -59,7 +59,7 @@ index ca417825eb0827caad817f65b5132f1de37e3679..69fcfff3f21168f334fd526cb65e63e0
// Paper start
for (WorldServer world : getWorlds()) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5255f3b0209226ee09827a51bb8282a220184975..f04b23b6ccf45701fc98dbbe9757181c94d82192 100644
+index f14fb972029d3125f428fb8244c4078722b52617..f000588b2d8b5bdedc076a8532cbd47a823fe1a5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -485,6 +485,7 @@ public abstract class PlayerList {