Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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@05ed6a6 Fix priority scheduling logic
PaperMC/Paper@967f98a Optimise chunk tick checking during chunk tick
PaperMC/Paper@00b949f Remove Moonrise utils to MCUtils, remove duplicated/unused utils
PaperMC/Paper@4efd24b Remove unused chunk system hooks in MCUtils
PaperMC/Paper@b653276 Finish chunk tick iteration optimisation port from Moonrise
PaperMC/Paper@2df5bba Log throwable when failing to save chunk/poi/entity data
PaperMC/Paper@44c3dd0 fix exact choice shapeless recipes (#10973)
This commit is contained in:
granny
2024-07-17 19:14:12 -07:00
parent 8f0f20df9a
commit 86a65436a7
28 changed files with 200 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0111-Implement-TPSBar.patch
View File

@@ -17,7 +17,7 @@ index 38a345901a743f5ddac18ba876d5245c5c11f111..c7b7cc0d9ce589b5a0600e9b8c46b2e5
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8e1e74889884ec2f957602fa669b842e3eef047d..9ce17aed1c3eeba0acaaa9f12318536978612316 100644
index 5b92d2b80bbbff7b1a2c8ba2c59c16ca8396de73..92ed650b8c277c30a4c2f3b09c0696c5138cf90c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1133,6 +1133,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,10 +41,10 @@ index 04fd1172b47a74b16955cf93fc20f64fd056b16e..34dfcdb3de191c08dffe22f624f4e968
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 44ae91271562cdbd4d4df706241accbd6e277ac3..a10d08bdd18168beb822638e4405fc2fb322e7b8 100644
index 01f95dd19ffac68d64a6a800ce8121a704faef0e..f0a08a9a96425cee26775698c5c6fd7db2f7cd2c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -303,6 +303,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -302,6 +302,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
public @Nullable String clientBrandName = null; // Paper - Brand support
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
public boolean purpurClient = false; // Purpur
@@ -52,7 +52,7 @@ index 44ae91271562cdbd4d4df706241accbd6e277ac3..a10d08bdd18168beb822638e4405fc2f
// Paper start - rewrite chunk system
private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
@@ -602,6 +603,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -599,6 +600,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
});
}
@@ -60,7 +60,7 @@ index 44ae91271562cdbd4d4df706241accbd6e277ac3..a10d08bdd18168beb822638e4405fc2f
}
@Override
@@ -678,6 +680,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -675,6 +677,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
});
}
@@ -68,7 +68,7 @@ index 44ae91271562cdbd4d4df706241accbd6e277ac3..a10d08bdd18168beb822638e4405fc2f
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -3066,5 +3069,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -3063,5 +3066,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
this.server.getPlayerList().respawn(this, true, RemovalReason.KILLED, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH, to);
}
}