mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f613437 Fix CraftPlayerProfile#setId regression (#9822) PaperMC/Paper@3e9d2ac Don't call options events on login (#9834) PaperMC/Paper@e4d184f Replace bukkit Consumers with java consumers (#9836) PaperMC/Paper@3e1c5e3 Add BlockData setter for FallingBlock (#9829) PaperMC/Paper@852c1c2 Add additional tags to ItemMeta obfuscation filtering (#9665)
This commit is contained in:
@@ -17,7 +17,7 @@ index e254f7c498c5a1608afe130b2dd4d3d037069f25..af712f089e7919fa0bd3946866fd3486
|
||||
|
||||
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 97317911fac30d1f762291d0d615e004384a9b6f..e7c90ce23a68cbf4b44a750f2dafc06c19e5fb06 100644
|
||||
index 4cc1604114ce283a70fb8faf89ac2b3979b06b52..f00c8b834db7ff9c92d878560d83db91b76c82fe 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -276,6 +276,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -44,7 +44,7 @@ index 97317911fac30d1f762291d0d615e004384a9b6f..e7c90ce23a68cbf4b44a750f2dafc06c
|
||||
}
|
||||
|
||||
// CraftBukkit start - World fallback code, either respawn location or global spawn
|
||||
@@ -2794,5 +2797,13 @@ public class ServerPlayer extends Player {
|
||||
@@ -2799,5 +2802,13 @@ public class ServerPlayer extends Player {
|
||||
public void tpsBar(boolean tpsBar) {
|
||||
this.tpsBar = tpsBar;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user