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:020f18aaa6fix: promote slf4j-api to api scope (#6343)c815948b6dFix ITEM_DROPPED stat not working properly (#6331)9a125eecb8Fix Incorrectly Typed Goals (#6200)23e3a0ccb6Add PlayerSetSpawnEvent (#5690)00028d57cfcall EntityDamageByBlockEvent for campfires (#6244)9b4a46f704[ci skip] add vs code files to .gitignore (#5663)a178fb895eMake hoppers respect inventory max stack size (#4838)4a2f53c6e8Add missing DamageCause for EntityDamageByBlockEvent (#6352)f261419fd5clone itemstack to return remaining stack (#6353)
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 5283d0d27da27f0946905f30ef7a8265175952fb..087c29cf45e45f769096a2a890befd959f49ca36 100644
|
||||
index b2bf0ce295520e7dc6f17fd904769e47164675eb..023b3df9b375aa8f91a5f2e7d3592482afac7c0e 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 5283d0d27da27f0946905f30ef7a8265175952fb..087c29cf45e45f769096a2a890befd95
|
||||
}
|
||||
|
||||
// CraftBukkit start - World fallback code, either respawn location or global spawn
|
||||
@@ -2538,5 +2541,13 @@ public class ServerPlayer extends Player {
|
||||
@@ -2559,5 +2562,13 @@ public class ServerPlayer extends Player {
|
||||
public void tpsBar(boolean tpsBar) {
|
||||
this.tpsBar = tpsBar;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user