Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
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:
granny
2023-10-14 18:33:56 -07:00
parent ad03187fab
commit ff126d3257
12 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0115-Implement-TPSBar.patch
View File

@@ -41,7 +41,7 @@ index aa85cb619315b327469e6aea92876f47235ce725..7b929d080e5fdd3a535a22a5f9e35955
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index dd83aa83e8d4da4d16e9731f8527cd0f470848e0..9d6733c426c823cfac4da542fd83c5e6832312e1 100644
index 48337c143a825c2107b9f1c4b086050ad02e553a..baf508a942b02d94dfe2c1fffc3cde930a492367 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -275,6 +275,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index dd83aa83e8d4da4d16e9731f8527cd0f470848e0..9d6733c426c823cfac4da542fd83c5e6
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2769,5 +2772,13 @@ public class ServerPlayer extends Player {
@@ -2774,5 +2777,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
}
}