Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07: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@d332623 Avoid potential place where the world map could be modified after its iterator is created (#8315)
PaperMC/Paper@6736f39 Fix mangled patch
PaperMC/Paper@4d52f1d Add method isTickingWorlds to Bukkit (#8316)
PaperMC/Paper@62680d5 Avoid item meta usage for itemstack enchantment getter (#8373)
PaperMC/Paper@b4c025b Fix player desync on dimension change (#8253)
This commit is contained in:
BillyGalbreath
2022-09-24 08:04:00 -05:00
parent 103965b5b4
commit ec75e5964a
28 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0125-Implement-TPSBar.patch
View File

@@ -17,7 +17,7 @@ index ab0f00128f8c1b13c3eb5787df0c4e26372e0734..14b12cb6967c1c2735cf6a0eafdf6e23
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index eb12fed7ee6d7d3a5f5b9e99d8f11b38122cac7e..872632875d1569dd348c78983b260ebeb746b829 100644
index 635e02597e8f57f80eadc1ec78d87b9742c01406..10f33aed80fd963accbac1f43fd9b392d4452fb9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1050,6 +1050,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,7 +41,7 @@ index 629024e5c3f480bd50ae2df9dadb72f06a62c3bf..19bf680e222d7f91a0e7f67b29e3a5e3
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 725358518b73b908c8150bdbabed68909c91f4d4..b858ce2ad443f6690dd71e56fb9eea14793df19d 100644
index 6036db50f05e8658f645848e03b276a1352a9424..e8663f8f23f71cfabde12585c6d9bc8215eb21e3 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 725358518b73b908c8150bdbabed68909c91f4d4..b858ce2ad443f6690dd71e56fb9eea14
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2613,5 +2616,13 @@ public class ServerPlayer extends Player {
@@ -2614,5 +2617,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}