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

fix timings/profiler compilation issues

Browse Source
This commit is contained in:
granny
2024-06-16 01:55:29 -07:00
parent cdb192f3ad
commit bf6dbdd163
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patches/server/0248-Remove-Timings.patch
View File

@@ -4,19 +4,6 @@ Date: Fri, 1 Jul 2022 04:03:37 -0500
Subject: [PATCH] Remove Timings
diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java
index 545624cfeefacc7bff3bb24adc9b6d52672db701..57ab4dcd53bf4df7d0c70951d9c2ab139b77fc31 100644
--- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java
+++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java
@@ -1694,7 +1694,7 @@ public final class NewChunkHolder {
if (shutdown) {
this.lastEntityUnload = null;
}
- }
+ //} // Purpur
return executedUnloadTask | canSaveChunk | canSaveEntities | canSavePOI ? new SaveStat(executedUnloadTask || canSaveChunk, canSaveEntities, canSavePOI): null;
}
diff --git a/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java b/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java
index 0c3c82b28e581286b798ee58ca4193efc2faff4a..24121a43aeb5e9bce013f30c92dddd15f99736c6 100644
--- a/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java
@@ -354,7 +341,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..8bead89ad6f54f5dbc6b03d90b6bb111
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 49f77274309befcdef1548e875480b9f667a414e..40f02c3871928be26cefca3afc62286cbee15e69 100644
index 49f77274309befcdef1548e875480b9f667a414e..e78d3a8e286a0f62b0211dec91cac1ca64f73e52 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.
@@ -494,7 +481,7 @@ index 49f77274309befcdef1548e875480b9f667a414e..40f02c3871928be26cefca3afc62286c
if (progressListener != null) {
progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
}
@@ -1339,9 +1339,9 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1339,10 +1339,10 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
progressListener.progressStage(Component.translatable("menu.savingChunks"));
}
@@ -502,10 +489,12 @@ index 49f77274309befcdef1548e875480b9f667a414e..40f02c3871928be26cefca3afc62286c
+ //timings.worldSaveChunks.startTiming(); // Paper // Purpur
if (!close) { chunkproviderserver.save(flush); } // Paper - add close param
- timings.worldSaveChunks.stopTiming(); // Paper
- }// Paper
+ //timings.worldSaveChunks.stopTiming(); // Paper // Purpur
}// Paper
+ //}// Paper // Purpur
// Paper - rewrite chunk system
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index f4f965a51628a096f6697f4008ec9dba04d30fd2..224ee4649a8e2d3c99ac5ca298233bcb89248fc3 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java

21
patches/server/0249-Remove-Mojang-Profiler.patch
View File

@@ -585,7 +585,7 @@ index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 40f02c3871928be26cefca3afc62286cbee15e69..fd8149d55488a7fbb6143dde669b957812c93464 100644
index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41edbc39ca77 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -645,16 +645,16 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -741,7 +741,24 @@ index 40f02c3871928be26cefca3afc62286cbee15e69..fd8149d55488a7fbb6143dde669b9578
//timings.chunkTicksBlocks.startTiming(); // Paper // Purpur
if (randomTickSpeed > 0) {
LevelChunkSection[] achunksection = chunk.getSections();
@@ -929,7 +929,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -909,7 +909,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
for (int l1 = 0; l1 < randomTickSpeed; ++l1) {
BlockPos blockposition1 = this.getBlockRandomPos(j, k1, k, 15);
- gameprofilerfiller.push("randomTick");
+ //gameprofilerfiller.push("randomTick"); // Purpur
BlockState iblockdata = chunksection.getBlockState(blockposition1.getX() - j, blockposition1.getY() - k1, blockposition1.getZ() - k);
if (iblockdata.isRandomlyTicking()) {
@@ -922,14 +922,14 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
fluid.randomTick(this, blockposition1, this.random);
}
- gameprofilerfiller.pop();
+ //gameprofilerfiller.pop(); // Purpur
}
}
}
}
//timings.chunkTicksBlocks.stopTiming(); // Paper // Purpur