mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
35ac5d48ed
* Unify comment format * More configurable * Remove one extra execute mid-tick task call in level tick when PWT is disabled This may cause extremely rare, weird, strange, magic, mysterious issues with plugins, or potentially more. One example is that it may cause boss mob duplication issue when `ONE MOB ONLY` was enabled in plugin SupremeBosses
73 lines
4.7 KiB
Diff
73 lines
4.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Taiyou06 <kaandindar21@gmail.com>
|
|
Date: Sat, 22 Mar 2025 03:02:52 +0100
|
|
Subject: [PATCH] Micro optimizations for random tick
|
|
|
|
|
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
|
index ecd36d743bb9a0d9794eaac67692804c00f1bb67..209d18228aa28b063f8f3e60df6a3e2c5aa770fc 100644
|
|
--- a/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
|
@@ -1052,7 +1052,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
|
// Paper start - optimise random ticking
|
|
private void optimiseRandomTick(final LevelChunk chunk, final int tickSpeed) {
|
|
final LevelChunkSection[] sections = chunk.getSections();
|
|
- final int minSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinSection((ServerLevel)(Object)this);
|
|
+ final int minSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinSection(this); // Leaf - Micro optimizations for random tick - no redundant cast
|
|
final net.minecraft.world.level.levelgen.BitRandomSource simpleRandom = this.simpleRandom; // Leaf - Faster random generator - upcasting
|
|
final boolean doubleTickFluids = !ca.spottedleaf.moonrise.common.PlatformHooks.get().configFixMC224294();
|
|
|
|
@@ -1061,41 +1061,41 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
|
final int offsetZ = cpos.z << 4;
|
|
|
|
for (int sectionIndex = 0, sectionsLen = sections.length; sectionIndex < sectionsLen; sectionIndex++) {
|
|
- final int offsetY = (sectionIndex + minSection) << 4;
|
|
+ // Leaf start - Micro optimizations for random tick
|
|
final LevelChunkSection section = sections[sectionIndex];
|
|
- final net.minecraft.world.level.chunk.PalettedContainer<net.minecraft.world.level.block.state.BlockState> states = section.states;
|
|
if (!section.isRandomlyTickingBlocks()) {
|
|
continue;
|
|
}
|
|
+ final int offsetY = (sectionIndex + minSection) << 4;
|
|
+ final net.minecraft.world.level.chunk.PalettedContainer<net.minecraft.world.level.block.state.BlockState> states = section.states;
|
|
+ // Leaf end - Micro optimizations for random tick
|
|
|
|
- final ca.spottedleaf.moonrise.common.list.ShortList tickList = ((ca.spottedleaf.moonrise.patches.block_counting.BlockCountingChunkSection)section).moonrise$getTickingBlockList();
|
|
+ final ca.spottedleaf.moonrise.common.list.ShortList tickList = section.moonrise$getTickingBlockList(); // Leaf - Micro optimizations for random tick - no redundant cast
|
|
|
|
for (int i = 0; i < tickSpeed; ++i) {
|
|
- final int tickingBlocks = tickList.size();
|
|
final int index = simpleRandom.nextInt() & ((16 * 16 * 16) - 1);
|
|
|
|
- if (index >= tickingBlocks) {
|
|
+ if (index >= tickList.size()) { // Leaf - Micro optimizations for random tick - inline one-time value
|
|
// most of the time we fall here
|
|
continue;
|
|
}
|
|
|
|
- final int location = (int)tickList.getRaw(index) & 0xFFFF;
|
|
+ final int location = tickList.getRaw(index); // Leaf - Micro optimizations for random tick - no unnecessary operations
|
|
final BlockState state = states.get(location);
|
|
|
|
// do not use a mutable pos, as some random tick implementations store the input without calling immutable()!
|
|
- final BlockPos pos = new BlockPos((location & 15) | offsetX, ((location >>> (4 + 4)) & 15) | offsetY, ((location >>> 4) & 15) | offsetZ);
|
|
+ final BlockPos pos = new BlockPos((location & 15) | offsetX, (location >>> (4 + 4)) | offsetY, ((location >>> 4) & 15) | offsetZ); // Leaf - Micro optimizations for random tick - no redundant mask
|
|
|
|
- state.randomTick((ServerLevel)(Object)this, pos, simpleRandom);
|
|
+ state.randomTick(this, pos, simpleRandom); // Leaf - Micro optimizations for random tick - no redundant cast
|
|
if (doubleTickFluids) {
|
|
final FluidState fluidState = state.getFluidState();
|
|
if (fluidState.isRandomlyTicking()) {
|
|
- fluidState.randomTick((ServerLevel)(Object)this, pos, simpleRandom);
|
|
+ fluidState.randomTick(this, pos, simpleRandom); // Leaf - Micro optimizations for random tick - no redundant cast
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
- return;
|
|
+ // Leaf - Micro optimizations for random tick - no redundant return
|
|
}
|
|
// Paper end - optimise random ticking
|
|
|