Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08: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@ab1afb0 Fix missing profiler.pop() in PathFinder::findPath (#10320)
This commit is contained in:
granny
2024-03-15 10:56:38 -07:00
parent 65150b4901
commit 69b25cc1ca
2 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.4-R0.1-SNAPSHOT version = 1.20.4-R0.1-SNAPSHOT
mcVersion = 1.20.4 mcVersion = 1.20.4
paperCommit = 62b220a87f6991c33423346e5f50e64058e7bdd9 paperCommit = ab1afb0ed8838117f00a70fcf507ffedfb00c414
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

55
patches/server/0263-Remove-Mojang-Profiler.patch
View File

@@ -39,7 +39,7 @@ index 0026235782aeb5e663faa3aaf11040635cd12204..48a4f26eec06777b4ae165db6566c1f6
} }
diff --git a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java diff --git a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
index 05e1c94268cf5c6897807cd7acced652856a09ea..d1c7effca3592a234925657136f750717d696873 100644 index 05e1c94268cf5c6897807cd7acced652856a09ea..16ff9771fa57b17a50e0930b95a86da8e9d170c0 100644
--- a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java --- a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
+++ b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java +++ b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
@@ -43,9 +43,9 @@ public class BuildContexts<T extends ExecutionCommandSource<T>> { @@ -43,9 +43,9 @@ public class BuildContexts<T extends ExecutionCommandSource<T>> {
@@ -59,12 +59,12 @@ index 05e1c94268cf5c6897807cd7acced652856a09ea..d1c7effca3592a234925657136f75071
} }
} finally { } finally {
- context.profiler().pop(); - context.profiler().pop();
+ // context.profiler().pop(); // Purpur + //context.profiler().pop(); // Purpur
} }
} }
diff --git a/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java b/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java diff --git a/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java b/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java
index 821dc4aeaf48460000682604fba51b340b9738e7..3aa2ce6a2a3d3cdfc372a60419a09f49002339da 100644 index 821dc4aeaf48460000682604fba51b340b9738e7..9882e89abcce1bf0b484424dd0a25bd3bbb841b4 100644
--- a/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java --- a/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java
+++ b/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java +++ b/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java
@@ -23,9 +23,9 @@ public class ExecuteCommand<T extends ExecutionCommandSource<T>> implements Unbo @@ -23,9 +23,9 @@ public class ExecuteCommand<T extends ExecutionCommandSource<T>> implements Unbo
@@ -84,7 +84,7 @@ index 821dc4aeaf48460000682604fba51b340b9738e7..3aa2ce6a2a3d3cdfc372a60419a09f49
executionCommandSource.handleError(var9, this.modifiers.isForked(), executionContext.tracer()); executionCommandSource.handleError(var9, this.modifiers.isForked(), executionContext.tracer());
} finally { } finally {
- executionContext.profiler().pop(); - executionContext.profiler().pop();
+ // executionContext.profiler().pop(); // Purpur + //executionContext.profiler().pop(); // Purpur
} }
} }
@@ -402,7 +402,7 @@ index b1d2464fc151d4c636c3c2dc4e7b9446ff5dc0a0..8384f72d408f6f31c4c8a1ba47b8caba
} else { } else {
ProfileResults methodprofilerresults = this.debugCommandProfiler.stop(Util.getNanos(), this.tickCount); ProfileResults methodprofilerresults = this.debugCommandProfiler.stop(Util.getNanos(), this.tickCount);
diff --git a/src/main/java/net/minecraft/server/ServerFunctionManager.java b/src/main/java/net/minecraft/server/ServerFunctionManager.java diff --git a/src/main/java/net/minecraft/server/ServerFunctionManager.java b/src/main/java/net/minecraft/server/ServerFunctionManager.java
index df0c15f6b5b2224d53e4f8fad42b9a1e5f33dc25..5dd0dcb47211cec69189115bf4eab1dffc3ca8cf 100644 index df0c15f6b5b2224d53e4f8fad42b9a1e5f33dc25..92aa26881818fec92d0663e2ccf507165c34c733 100644
--- a/src/main/java/net/minecraft/server/ServerFunctionManager.java --- a/src/main/java/net/minecraft/server/ServerFunctionManager.java
+++ b/src/main/java/net/minecraft/server/ServerFunctionManager.java +++ b/src/main/java/net/minecraft/server/ServerFunctionManager.java
@@ -53,10 +53,10 @@ public class ServerFunctionManager { @@ -53,10 +53,10 @@ public class ServerFunctionManager {
@@ -428,7 +428,7 @@ index df0c15f6b5b2224d53e4f8fad42b9a1e5f33dc25..5dd0dcb47211cec69189115bf4eab1df
public void execute(CommandFunction<CommandSourceStack> function, CommandSourceStack source) { public void execute(CommandFunction<CommandSourceStack> function, CommandSourceStack source) {
- ProfilerFiller gameprofilerfiller = this.server.getProfiler(); - ProfilerFiller gameprofilerfiller = this.server.getProfiler();
+ // ProfilerFiller gameprofilerfiller = this.server.getProfiler(); // Purpur + //ProfilerFiller gameprofilerfiller = this.server.getProfiler(); // Purpur
- gameprofilerfiller.push(() -> { - gameprofilerfiller.push(() -> {
+ /*gameprofilerfiller.push(() -> { // Purpur + /*gameprofilerfiller.push(() -> { // Purpur
@@ -443,7 +443,7 @@ index df0c15f6b5b2224d53e4f8fad42b9a1e5f33dc25..5dd0dcb47211cec69189115bf4eab1df
ServerFunctionManager.LOGGER.warn("Failed to execute function {}", function.id(), exception); ServerFunctionManager.LOGGER.warn("Failed to execute function {}", function.id(), exception);
} finally { } finally {
- gameprofilerfiller.pop(); - gameprofilerfiller.pop();
+ // gameprofilerfiller.pop(); // Purpur + //gameprofilerfiller.pop(); // Purpur
} }
} }
@@ -477,7 +477,7 @@ index 3fbc1e7e401331790d590dcd513a0a267b5ea181..bb412ca874b85d777c0e3565fcefcee1
public boolean hasWork() { public boolean hasWork() {
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index bbc3153379d7da8b4d91c49a3ba83d4415a7671a..6167ffb1263a1a65b582b7d295d1d77ef38c3ee3 100644 index bbc3153379d7da8b4d91c49a3ba83d4415a7671a..7b3ba500f465b999ce11964b0e4e30f36005536e 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -264,16 +264,16 @@ public class ServerChunkCache extends ChunkSource { @@ -264,16 +264,16 @@ public class ServerChunkCache extends ChunkSource {
@@ -562,7 +562,7 @@ index bbc3153379d7da8b4d91c49a3ba83d4415a7671a..6167ffb1263a1a65b582b7d295d1d77e
this.level.resetIceAndSnowTick(); // Pufferfish - reset ice & snow tick random this.level.resetIceAndSnowTick(); // Pufferfish - reset ice & snow tick random
if (this.level.getServer().tickRateManager().runsNormally()) { if (this.level.getServer().tickRateManager().runsNormally()) {
- gameprofilerfiller.popPush("naturalSpawnCount"); - gameprofilerfiller.popPush("naturalSpawnCount");
+ // gameprofilerfiller.popPush("naturalSpawnCount"); // Purpur + //gameprofilerfiller.popPush("naturalSpawnCount"); // Purpur
//this.level.timings.countNaturalMobs.startTiming(); // Paper - timings // Purpur //this.level.timings.countNaturalMobs.startTiming(); // Paper - timings // Purpur
int k = this.distanceManager.getNaturalSpawnChunkCount(); int k = this.distanceManager.getNaturalSpawnChunkCount();
// Paper start - Optional per player mob spawns // Paper start - Optional per player mob spawns
@@ -614,7 +614,7 @@ index bbc3153379d7da8b4d91c49a3ba83d4415a7671a..6167ffb1263a1a65b582b7d295d1d77e
} }
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index e6e4df519fb2f9fb75f63da458d6b352c8b30554..921ff8253130fb40b8bbe10cd9dfe39565064ab1 100644 index e6e4df519fb2f9fb75f63da458d6b352c8b30554..99cb0d3a9a64f8be8322a24d9f4e833a5b7d3588 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -824,16 +824,16 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -824,16 +824,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -630,10 +630,10 @@ index e6e4df519fb2f9fb75f63da458d6b352c8b30554..921ff8253130fb40b8bbe10cd9dfe395
if (flag) { if (flag) {
- gameprofilerfiller.push("world border"); - gameprofilerfiller.push("world border");
+ // gameprofilerfiller.push("world border"); // Purpur + //gameprofilerfiller.push("world border"); // Purpur
this.getWorldBorder().tick(); this.getWorldBorder().tick();
- gameprofilerfiller.popPush("weather"); - gameprofilerfiller.popPush("weather");
+ // gameprofilerfiller.popPush("weather"); // Purpur + //gameprofilerfiller.popPush("weather"); // Purpur
this.advanceWeatherCycle(); this.advanceWeatherCycle();
} }
@@ -1095,7 +1095,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
}; };
} }
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 62fc774c91b12b100b982b1ff8fbb2495a5551ee..0014046304fbb66925144ecccd0c0aa1c901c485 100644 index 7f75528cd7d3d1e4df0af9ac6fc05a2bf3a1c7a9..35a73f5c73adcf596b2b1f43b55dff925f01d762 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -861,7 +861,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -861,7 +861,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1546,7 +1546,7 @@ index 09f796ec491f21520e1fcc454249e4696dad3b1b..9bf06cf7b3706f8883e1a0ceac8b1aeb
} }
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index e73d7b47327da59dbf49c2160acd0b3ebb2a4232..472b76d6ec721fa46857097589aa879f237e3e0d 100644 index e73d7b47327da59dbf49c2160acd0b3ebb2a4232..e3f72230e94b15a401e45cf8c10a1890d3278431 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -315,13 +315,13 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo @@ -315,13 +315,13 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -1554,7 +1554,7 @@ index e73d7b47327da59dbf49c2160acd0b3ebb2a4232..472b76d6ec721fa46857097589aa879f
@Override @Override
protected void customServerAiStep() { protected void customServerAiStep() {
- this.level().getProfiler().push("axolotlBrain"); - this.level().getProfiler().push("axolotlBrain");
+ // this.level().getProfiler().push("axolotlBrain"); // Purpur + //this.level().getProfiler().push("axolotlBrain"); // Purpur
if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
this.getBrain().tick((ServerLevel) this.level(), this); this.getBrain().tick((ServerLevel) this.level(), this);
- this.level().getProfiler().pop(); - this.level().getProfiler().pop();
@@ -1692,7 +1692,7 @@ index 15fd1af0773ba1254a429240444f48e68e29ee74..1d36459ee10da702d65b4a6d139a05fd
} }
diff --git a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java diff --git a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java
index ab183a7d94a27d5235ff33ce7784c92d66d40b89..94431d5c789a9f558c16c0d1fc8f1f7463421ec6 100644 index ab183a7d94a27d5235ff33ce7784c92d66d40b89..3001c8f246e4ee4bfeae0d3ad9e0c2afb309f629 100644
--- a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java --- a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java
+++ b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java +++ b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java
@@ -200,10 +200,10 @@ public class Breeze extends Monster { @@ -200,10 +200,10 @@ public class Breeze extends Monster {
@@ -1700,12 +1700,12 @@ index ab183a7d94a27d5235ff33ce7784c92d66d40b89..94431d5c789a9f558c16c0d1fc8f1f74
@Override @Override
protected void customServerAiStep() { protected void customServerAiStep() {
- this.level().getProfiler().push("breezeBrain"); - this.level().getProfiler().push("breezeBrain");
+ // this.level().getProfiler().push("breezeBrain"); // Purpur + //this.level().getProfiler().push("breezeBrain"); // Purpur
this.getBrain().tick((ServerLevel)this.level(), this); this.getBrain().tick((ServerLevel)this.level(), this);
- this.level().getProfiler().popPush("breezeActivityUpdate"); - this.level().getProfiler().popPush("breezeActivityUpdate");
- this.level().getProfiler().pop(); - this.level().getProfiler().pop();
+ // this.level().getProfiler().popPush("breezeActivityUpdate"); // Purpur + //this.level().getProfiler().popPush("breezeActivityUpdate"); // Purpur
+ // this.level().getProfiler().pop(); // Purpur + //this.level().getProfiler().pop(); // Purpur
super.customServerAiStep(); super.customServerAiStep();
} }
@@ -1800,7 +1800,7 @@ index ef7c67f591ca4a3c73b87a7c44b37ad0b51d875c..50202286a0d83f7fe5331eb669d99971
this.assignProfessionWhenSpawned = false; this.assignProfessionWhenSpawned = false;
} }
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index b678da2cbb93cea7971bc3c4d324cfca18b0bc97..b0884758d00efb1e3b4b47a539de2a819aab978a 100644 index b678da2cbb93cea7971bc3c4d324cfca18b0bc97..908d8bbc2560073255d742ca11d59f8280bab895 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java --- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -675,7 +675,7 @@ public class Explosion { @@ -675,7 +675,7 @@ public class Explosion {
@@ -1808,7 +1808,7 @@ index b678da2cbb93cea7971bc3c4d324cfca18b0bc97..b0884758d00efb1e3b4b47a539de2a81
if (flag1) { if (flag1) {
- this.level.getProfiler().push("explosion_blocks"); - this.level.getProfiler().push("explosion_blocks");
+ // this.level.getProfiler().push("explosion_blocks"); // Purpur + //this.level.getProfiler().push("explosion_blocks"); // Purpur
List<Pair<ItemStack, BlockPos>> list = new ArrayList(); List<Pair<ItemStack, BlockPos>> list = new ArrayList();
Util.shuffle(this.toBlow, this.level.random); Util.shuffle(this.toBlow, this.level.random);
@@ -1817,7 +1817,7 @@ index b678da2cbb93cea7971bc3c4d324cfca18b0bc97..b0884758d00efb1e3b4b47a539de2a81
} }
- this.level.getProfiler().pop(); - this.level.getProfiler().pop();
+ // this.level.getProfiler().pop(); // Purpur + //this.level.getProfiler().pop(); // Purpur
} }
if (this.fire) { if (this.fire) {
@@ -1936,7 +1936,7 @@ index 8c0df10efd59594c63cca2a1c22386acf17e5299..1b49ecbf8fdbe8b734f8ca5191dc9ed7
if (throwable instanceof ThreadDeath) throw throwable; // Paper if (throwable instanceof ThreadDeath) throw throwable; // Paper
// Paper start - Prevent block entity and entity crashes // Paper start - Prevent block entity and entity crashes
diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
index eb18494bd7257fa5eb00dea16cf4d5667b796f2b..f039d6109ee6f55542adc8f30476ba9a9e4974bf 100644 index 8aa4ac3a6affbe888d6084a27b668c58dfda6c79..c38c90e6a2b4b04105e00c71a4640a5aa7065b93 100644
--- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java --- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
+++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
@@ -53,8 +53,8 @@ public class PathFinder { @@ -53,8 +53,8 @@ public class PathFinder {
@@ -1950,6 +1950,15 @@ index eb18494bd7257fa5eb00dea16cf4d5667b796f2b..f039d6109ee6f55542adc8f30476ba9a
// Set<Target> set = positions.keySet(); // Set<Target> set = positions.keySet();
startNode.g = 0.0F; startNode.g = 0.0F;
startNode.h = this.getBestH(startNode, positions); // Paper - optimize collection startNode.h = this.getBestH(startNode, positions); // Paper - optimize collection
@@ -123,7 +123,7 @@ public class PathFinder {
if (best == null || comparator.compare(path, best) < 0)
best = path;
}
- profiler.pop();
+ //profiler.pop(); // Purpur
return best;
// Paper end - Perf: remove streams and optimize collection
}
diff --git a/src/main/java/net/minecraft/world/ticks/LevelTicks.java b/src/main/java/net/minecraft/world/ticks/LevelTicks.java diff --git a/src/main/java/net/minecraft/world/ticks/LevelTicks.java b/src/main/java/net/minecraft/world/ticks/LevelTicks.java
index 1d7c663fa0e550bd0cfb9a4b83ccd7e2968666f0..0043c0087896a6df6910b0500da37d84b287c901 100644 index 1d7c663fa0e550bd0cfb9a4b83ccd7e2968666f0..0043c0087896a6df6910b0500da37d84b287c901 100644
--- a/src/main/java/net/minecraft/world/ticks/LevelTicks.java --- a/src/main/java/net/minecraft/world/ticks/LevelTicks.java