Updated Upstream (Paper) (#967)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@608482d cleanup filtered sign text (#7777)
PaperMC/Paper@4166632 Updated Upstream (Bukkit/CraftBukkit) (#7776)
PaperMC/Paper@e564110 Couple fixes/improvements to PlayerSetSpawnEvent (#6754)
PaperMC/Paper@e5da93a Deprecate duplicate SoundGroup API (#7509)
This commit is contained in:
Oharass
2022-05-01 16:47:48 -05:00
committed by GitHub
parent a9042b304f
commit cda46a038f
12 changed files with 29 additions and 29 deletions

View File

@@ -17,7 +17,7 @@ index 9e7cc8bf867b6e4f86b55e1f1d3a1cb6233c90f1..7c30d8d61a8e82d8a1f61451090e9bbb
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 7eeaecfe6e1619d48af59982c75352c634ebc123..bfdf0857a130948378c67936f36be2a3d4c1b542 100644
index f0666c85eafc802837380175f2e945f41cef0da1..d106cd682d03bfddd1f441ed43081b41f722d5c4 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -256,6 +256,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 7eeaecfe6e1619d48af59982c75352c634ebc123..bfdf0857a130948378c67936f36be2a3
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2586,5 +2589,13 @@ public class ServerPlayer extends Player {
@@ -2587,5 +2590,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}