mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes:0fc6213f9cAllow skipping writing of comments to server.properties (#6251)aec9781f52Fix incorrect colors in ConsoleCommandSender messages with TranslatableComponents (#6287)9a74e70cc0fix: boats' bounding boxes must be deflated, not inflated (#6314)6226208d64Fix SysoutCatcher when plugins log before initialisation (Fixes #6323)d239eca9ddFix writing server.properties with wrong encoding (#6322)f521a18a17Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
@@ -17,7 +17,7 @@ index 528fd87ae1c1c01e13885d88fc8056b0f932fb61..bfad241892b8280d261ab8301245b91b
|
||||
|
||||
if (environment.includeIntegrated) {
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index 1156b34fa5d19042621caafa4aaeae8020cd646d..ad03eb867af1dbaf50d9c65461f0477d8911d883 100644
|
||||
index 5283d0d27da27f0946905f30ef7a8265175952fb..087c29cf45e45f769096a2a890befd959f49ca36 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -44,7 +44,7 @@ index 1156b34fa5d19042621caafa4aaeae8020cd646d..ad03eb867af1dbaf50d9c65461f0477d
|
||||
}
|
||||
|
||||
// CraftBukkit start - World fallback code, either respawn location or global spawn
|
||||
@@ -2533,5 +2536,13 @@ public class ServerPlayer extends Player {
|
||||
@@ -2538,5 +2541,13 @@ public class ServerPlayer extends Player {
|
||||
public void tpsBar(boolean tpsBar) {
|
||||
this.tpsBar = tpsBar;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user