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@21f125f Revert velocity natives to 3.1.2 (#11368)
PaperMC/Paper@0e82527 Fix NPE while trying to respawn an already disconnected player (#11353)
PaperMC/Paper@5d91bef Fix shulkerbox loot table replenish (#11366)
PaperMC/Paper@a8e6a93 Deprecate for removal all OldEnum-related methods (#11371)
PaperMC/Paper@925c3b9 Add FeatureFlag API (#8952)
This commit is contained in:
granny
2024-09-07 22:53:55 -07:00
parent 0a9941ee39
commit 88352c325f
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0253-Remove-Timings.patch
View File

@@ -199,7 +199,7 @@ index 2d3f9550d4fb47b461ed5d4c1de62d511b1ad31d..a3433ed1e8a15ec6336f99842bc80c62
@Override
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 305bcd9f76eb2927da143b9c7f022ff073e9518a..8ec14f27b1a56e230ed77b18315a4091f5165cbb 100644
index 6abae547de1c9de07a75800550631ca5ee693e0a..4b2a66b68e96b85e78c12a12c410ffab3c14ab71 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -962,7 +962,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -340,7 +340,7 @@ index dbc62bf37a9e6e1936558338521938a47a51e2d6..793f16cb4049d121a6ef7ca4fcd9519d
gameprofilerfiller.pop();
gameprofilerfiller.pop();
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 514620a64495023fa917c14c971cd112fd64b33a..7ece40ea9ad3ba74b93250f72b42fc6299bedc82 100644
index c65dc84615e5b434c15c26fb712a7e6336eeeb32..c3699c7dcc2c94215d6601c7c07669c37f1fa4ab 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -687,7 +687,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -510,10 +510,10 @@ index 514620a64495023fa917c14c971cd112fd64b33a..7ece40ea9ad3ba74b93250f72b42fc62
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index b1adc1291a03489722e3eea1b20233052b9aa0fd..1babe6756b904fd2e5b2d62f6adfa153e3b772f1 100644
index 53172745c5e68a22f651710860075bdc41debc8f..e4978abcc79ee51fa95442b82d9079c8ee1e60d6 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1231,7 +1231,7 @@ public abstract class PlayerList {
@@ -1232,7 +1232,7 @@ public abstract class PlayerList {
public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -522,7 +522,7 @@ index b1adc1291a03489722e3eea1b20233052b9aa0fd..1babe6756b904fd2e5b2d62f6adfa153
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1242,7 +1242,7 @@ public abstract class PlayerList {
@@ -1243,7 +1243,7 @@ public abstract class PlayerList {
}
// Paper end - Incremental chunk and player saving
}