mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 20:46:59 +01:00
90fe0d58a5
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry 255b2aa1 SPIGOT-7080: Add World#locateNearestBiome ff984826 Remove javadoc.io doc links CraftBukkit Changes: 71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler 38c599f9d PR-1272: Only allow one entity in CraftItem instead of two f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld Spigot Changes: e0e223fe Remove javadoc.io doc links
52 lines
2.0 KiB
Diff
52 lines
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 3b4d8a47e7fe08284b79fab2d147629e902db026..5946f06f63b5694034bd027984a4925b0831d439 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
|
|
@@ -142,19 +142,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
|