geforkt von Mirrors/Paper
01a13871de
Patch documentation to come Issues with the old system that are fixed now: - World generation does not scale with cpu cores effectively. - Relies on the main thread for scheduling and maintaining chunk state, dropping chunk load/generate rates at lower tps. - Unreliable prioritisation of chunk gen/load calls that block the main thread. - Shutdown logic is utterly unreliable, as it has to wait for all chunks to unload - is it guaranteed that the chunk system is in a state on shutdown that it can reliably do this? Watchdog shutdown also typically failed due to thread checks, which is now resolved. - Saving of data is not unified (i.e can save chunk data without saving entity data, poses problems for desync if shutdown is really abnormal. - Entities are not loaded with chunks. This caused quite a bit of headache for Chunk#getEntities API, but now the new chunk system loads entities with chunks so that they are ready whenever the chunk loads in. Effectively brings the behavior back to 1.16 era, but still storing entities in their own separate regionfiles. The above list is not complete. The patch documentation will complete it. New chunk system hard relies on starlight and dataconverter, and most importantly the new concurrent utilities in ConcurrentUtil. Some of the old async chunk i/o interface (i.e the old file io thread reroutes _some_ calls to the new file io thread) is kept for plugin compat reasons. It will be removed in the next major version of minecraft. The old legacy chunk system patches have been moved to the removed folder in case we need them again.
52 Zeilen
2.0 KiB
Diff
52 Zeilen
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Thu, 10 Jun 2021 14:36:00 -0700
|
|
Subject: [PATCH] Optimise BlockSoil nearby water lookup
|
|
|
|
Apparently the abstract block iteration was taking about
|
|
75% of the method call.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
|
|
index 94ea6b8986c8fe3aee220ef0c95b65c5cef21c72..d089887030ac7c7a79abca97134ba9291e244059 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
|
|
@@ -138,19 +138,27 @@ public class FarmBlock extends Block {
|
|
}
|
|
|
|
private static boolean isNearWater(LevelReader world, BlockPos pos) {
|
|
- Iterator iterator = BlockPos.betweenClosed(pos.offset(-4, 0, -4), pos.offset(4, 1, 4)).iterator();
|
|
-
|
|
- BlockPos blockposition1;
|
|
-
|
|
- do {
|
|
- if (!iterator.hasNext()) {
|
|
- return false;
|
|
+ // Paper start - remove abstract block iteration
|
|
+ int xOff = pos.getX();
|
|
+ int yOff = pos.getY();
|
|
+ int zOff = pos.getZ();
|
|
+
|
|
+ for (int dz = -4; dz <= 4; ++dz) {
|
|
+ int z = dz + zOff;
|
|
+ for (int dx = -4; dx <= 4; ++dx) {
|
|
+ int x = xOff + dx;
|
|
+ for (int dy = 0; dy <= 1; ++dy) {
|
|
+ int y = dy + yOff;
|
|
+ net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)world.getChunk(x >> 4, z >> 4);
|
|
+ net.minecraft.world.level.material.FluidState fluid = chunk.getBlockStateFinal(x, y, z).getFluidState();
|
|
+ if (fluid.is(FluidTags.WATER)) {
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
}
|
|
+ }
|
|
|
|
- blockposition1 = (BlockPos) iterator.next();
|
|
- } while (!world.getFluidState(blockposition1).is(FluidTags.WATER));
|
|
-
|
|
- return true;
|
|
+ return false;
|
|
}
|
|
|
|
@Override
|