Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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@2a39276 Add CrafterCraftEvent (#11082)
PaperMC/Paper@75af62b Split rewriting flag into `paper.disableOldApiSupport` and `paper.disablePluginRemapping` (#11108)
PaperMC/Paper@7ea4039 Fixup startup time log message
PaperMC/Paper@e71c1df Call PlayerChunkUnloadEvent
PaperMC/Paper@968bdeb Make CraftComplexRecipe extend CraftingRecipe (#11114)
PaperMC/Paper@f1f01a1 Adjust done message again (#11118)
This commit is contained in:
granny
2024-07-19 19:57:25 -07:00
parent 65d3665aee
commit 936c29ae2a
11 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
patches/server/0252-Remove-Mojang-Profiler.patch
View File

@@ -83,7 +83,7 @@ index e9775b4506909bee65a74964f0d5391a0513de1d..684f7f202305c09b1037c5d38a52a5ea
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb161fe8e02a 100644
index 696cbee14df0efda70d01c57dcd905a6c06fb7fe..ce0682727a0623b4781f6cd43ab54fca24490164 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -422,13 +422,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -118,7 +118,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -1307,16 +1307,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1305,16 +1305,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
boolean flag = i == 0L;
@@ -139,7 +139,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
this.tickServer(flag ? () -> {
return false;
} : this::haveTime);
@@ -1327,7 +1327,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1325,7 +1325,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
throw new RuntimeException("Chunk system crash propagated to tick()", crash);
}
// Paper end - rewrite chunk system
@@ -148,7 +148,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
this.mayHaveDelayedTasks = true;
this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
// Purpur start
@@ -1343,9 +1343,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1341,9 +1341,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.tickRateManager.endTickWork();
}
@@ -161,7 +161,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
this.isReady = true;
JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
}
@@ -1555,7 +1555,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1553,7 +1553,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -170,7 +170,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
super.doRunTask(ticktask);
}
@@ -1628,7 +1628,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1626,7 +1626,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
if (playerSaveInterval < 0) {
playerSaveInterval = autosavePeriod;
}
@@ -179,7 +179,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
try {
this.isSaving = true;
@@ -1643,7 +1643,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1641,7 +1641,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
} finally {
this.isSaving = false;
}
@@ -188,7 +188,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
// Paper end - Incremental chunk and player saving
// Paper start - move executeAll() into full server tick timing
//try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) { // Purpur
@@ -1655,7 +1655,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1653,7 +1653,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
// Paper end - Server Tick Events
@@ -197,7 +197,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
long j = Util.getNanos() - i;
int k = this.tickCount % 100;
@@ -1669,7 +1669,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1667,7 +1667,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.tickTimes60s.add(this.tickCount, j);
// Paper end - Add tick times API and /mspt command
this.logTickMethodTime(i);
@@ -206,7 +206,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
org.spigotmc.WatchdogThread.tick(); // Spigot
//co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper // Purpur
}
@@ -1760,11 +1760,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1758,11 +1758,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
});
// Paper end - Folia scheduler API
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -220,7 +220,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
//Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; moved down
// CraftBukkit start
@@ -1807,20 +1807,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1805,20 +1805,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
worldserver.updateLagCompensationTick(); // Paper - lag compensation
worldserver.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
@@ -246,7 +246,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
try {
//worldserver.timings.doTick.startTiming(); // Spigot // Purpur
@@ -1833,17 +1833,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1831,17 +1831,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
throw new ReportedException(crashreport);
}
@@ -268,7 +268,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
//MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper // Purpur
this.playerList.tick();
//MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper // Purpur
@@ -1851,7 +1851,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1849,7 +1849,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
GameTestTicker.SINGLETON.tick();
}
@@ -277,7 +277,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
//MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper // Purpur
for (int i = 0; i < this.tickables.size(); ++i) {
@@ -1859,7 +1859,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1857,7 +1857,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
//MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper // Purpur
@@ -286,7 +286,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
iterator = this.playerList.getPlayers().iterator();
while (iterator.hasNext()) {
@@ -1869,7 +1869,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1867,7 +1867,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
entityplayer.connection.resumeFlushing();
}
@@ -295,7 +295,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
}
private void synchronizeTime(ServerLevel world) {
@@ -1877,7 +1877,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1875,7 +1875,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void forceTimeSynchronization() {
@@ -304,7 +304,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
Iterator iterator = this.getAllLevels().iterator();
while (iterator.hasNext()) {
@@ -1886,7 +1886,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1884,7 +1884,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.synchronizeTime(worldserver);
}
@@ -313,7 +313,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
}
public boolean isLevelEnabled(Level world) {
@@ -2598,6 +2598,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2596,6 +2596,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@@ -321,7 +321,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
return this.profiler;
}
@@ -2844,7 +2845,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2842,7 +2843,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
private void startMetricsRecordingTick() {
@@ -330,7 +330,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
this.executeBlocking(() -> {
this.saveDebugReport(path.resolve("server"));
@@ -2854,40 +2855,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2852,40 +2853,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.willStartRecordingMetrics = false;
}
@@ -383,7 +383,7 @@ index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb16
}
public Path getWorldPath(LevelResource worldSavePath) {
@@ -2940,15 +2941,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2938,15 +2939,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public boolean isTimeProfilerRunning() {