Skip to content

Remove buffering in CraftBlock getNMS and getNMSFluid #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Biquaternions wants to merge 1 commit into
base: ver/1.21.8
Choose a base branch
from
Open

Remove buffering in CraftBlock getNMS and getNMSFluid #471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 31 additions & 66 deletions leaf-server/paper-patches/features/0049-SparklyPaper-Parallel-world-ticking.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,10 @@ index 8c597b54491521f759e2983329a522ba065c647f..10a1f9cf6a558037be7b91e7dfa102a4
}
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a472d68f3c 100644
index dd122bbbe2c33183017dbde6997d3f1cd08479b5..f8f9a00d26a0706ac6f4bb46545a650145178dd2 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -74,12 +74,97 @@ public class CraftBlock implements Block {
@@ -74,6 +74,63 @@ public class CraftBlock implements Block {
return new CraftBlock(world, position);
}

Expand Down Expand Up @@ -402,45 +402,9 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
+ // Leaf end - SparklyPaper - parallel world ticking
+
public net.minecraft.world.level.block.state.BlockState getNMS() {
- return this.world.getBlockState(this.position);
+ // Leaf start - SparklyPaper - parallel world ticking
+ ServerLevel level = getServerLevel();
+ String handlingMode = org.dreeam.leaf.config.modules.async.SparklyPaperParallelWorldTicking.asyncUnsafeReadHandling;
+
+ if (needsBuffering(level, handlingMode)) {
+ // Buffered path
+ return executeBufferedRead(level, org.dreeam.leaf.async.world.ReadOperationType.BLOCK_GET_NMS_STATE, new Object[]{this.position}, Blocks.AIR.defaultBlockState(), "getNMS");
+ } else {
+ // Strict/Disabled/Non-ServerLevel path
+ checkStrictMode(level, handlingMode, "getNMS");
+ try {
+ return this.world.getBlockState(this.position);
+ } catch (Exception e) {
+ org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.SEVERE, "PWT: Direct access failed for getNMS" + (level == null ? " (Not a ServerLevel)" : ""), e);
+ return Blocks.AIR.defaultBlockState();
+ }
+ }
+ // Leaf end - SparklyPaper - parallel world ticking
}

public net.minecraft.world.level.material.FluidState getNMSFluid() {
- return this.world.getFluidState(this.position);
+ // Leaf start - SparklyPaper - parallel world ticking
+ ServerLevel level = getServerLevel();
+ String handlingMode = org.dreeam.leaf.config.modules.async.SparklyPaperParallelWorldTicking.asyncUnsafeReadHandling;
+ checkStrictMode(level, handlingMode, "getNMSFluid");
+
+ try {
+ return this.world.getFluidState(this.position);
+ } catch (Exception e) {
+ org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.SEVERE, "PWT: Direct access failed for getNMSFluid" + (level == null ? " (Not a ServerLevel)" : ""), e);
+ return net.minecraft.world.level.material.Fluids.EMPTY.defaultFluidState();
+ }
+ // Leaf end - SparklyPaper - parallel world ticking
return this.world.getBlockState(this.position);
}

public BlockPos getPosition() {
@@ -142,10 +227,12 @@ public class CraftBlock implements Block {
@@ -142,10 +199,12 @@ public class CraftBlock implements Block {
return this.getWorld().getChunkAt(this);
}

Expand All @@ -453,7 +417,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
public void setData(final byte data, boolean applyPhysics) {
if (applyPhysics) {
this.setData(data, net.minecraft.world.level.block.Block.UPDATE_ALL);
@@ -155,12 +242,18 @@ public class CraftBlock implements Block {
@@ -155,12 +214,18 @@ public class CraftBlock implements Block {
}

private void setData(final byte data, int flags) {
Expand All @@ -473,15 +437,15 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
return CraftMagicNumbers.toLegacyData(state);
}

@@ -177,6 +270,7 @@ public class CraftBlock implements Block {
@@ -177,6 +242,7 @@ public class CraftBlock implements Block {
@Override
public void setType(Material type, boolean applyPhysics) {
Preconditions.checkArgument(type != null, "Material cannot be null");
+ // Leaf - SparklyPaper - parallel world ticking - Delegates to setBlockData, which delegates to setTypeAndData (which has checks)
this.setBlockData(type.createBlockData(), applyPhysics);
}

@@ -196,6 +290,11 @@ public class CraftBlock implements Block {
@@ -196,6 +262,11 @@ public class CraftBlock implements Block {
}

public static boolean setBlockState(LevelAccessor world, BlockPos pos, net.minecraft.world.level.block.state.BlockState oldState, net.minecraft.world.level.block.state.BlockState newState, boolean applyPhysics) {
Expand All @@ -493,7 +457,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
// SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in block entity cleanup
if (oldState.hasBlockEntity() && newState.getBlock() != oldState.getBlock()) { // SPIGOT-3725 remove old block entity if block changes
// SPIGOT-4612: faster - just clear tile
@@ -227,22 +326,62 @@ public class CraftBlock implements Block {
@@ -227,22 +298,62 @@ public class CraftBlock implements Block {

@Override
public Material getType() {
Expand Down Expand Up @@ -560,7 +524,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
}

public Block getFace(final BlockFace face) {
@@ -287,47 +426,32 @@ public class CraftBlock implements Block {
@@ -287,47 +398,32 @@ public class CraftBlock implements Block {
}

public static BlockFace notchToBlockFace(Direction notch) {
Expand Down Expand Up @@ -631,7 +595,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
}

@Override
@@ -344,18 +468,65 @@ public class CraftBlock implements Block {
@@ -344,18 +440,65 @@ public class CraftBlock implements Block {

@Override
public Biome getBiome() {
Expand Down Expand Up @@ -699,7 +663,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
this.getWorld().setBiome(this.getX(), this.getY(), this.getZ(), bio);
}

@@ -371,12 +542,50 @@ public class CraftBlock implements Block {
@@ -371,12 +514,50 @@ public class CraftBlock implements Block {

@Override
public boolean isBlockPowered() {
Expand Down Expand Up @@ -752,7 +716,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
}

@Override
@@ -398,44 +607,103 @@ public class CraftBlock implements Block {
@@ -398,45 +579,104 @@ public class CraftBlock implements Block {

@Override
public boolean isBlockFacePowered(BlockFace face) {
Expand Down Expand Up @@ -835,7 +799,8 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
+ if (needsBuffering(level, handlingMode)) {
+ // Buffered path
+ return executeBufferedRead(level, org.dreeam.leaf.async.world.ReadOperationType.BLOCK_GET_BLOCK_POWER, new Object[]{this.position, face}, 0, "getBlockPower");
+ } else {
} else {
- return Math.max(state.getValue(RedStoneWireBlock.POWER), power);
+ // Strict/Disabled/Non-ServerLevel path
+ checkStrictMode(level, handlingMode, "getBlockPower");
+ try {
Expand Down Expand Up @@ -863,24 +828,24 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
+ org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.SEVERE, "PWT: Direct access failed for getBlockPower" + (level == null ? " (Not a ServerLevel)" : ""), e);
+ return 0;
+ }
+ }
+ }
+
}
}
+ // Static helper, safe
+ public static int getPower(int currentMax, net.minecraft.world.level.block.state.BlockState neighborState) {
+ if (!neighborState.is(Blocks.REDSTONE_WIRE)) {
+ return currentMax;
} else {
- return Math.max(state.getValue(RedStoneWireBlock.POWER), power);
+ } else {
+ int neighborPower = neighborState.getValue(RedStoneWireBlock.POWER);
+ return Math.max(neighborPower, currentMax);
}
}
+ }
+ }
+ // Leaf end - SparklyPaper - parallel world ticking
+
@Override
public int getBlockPower() {
@@ -478,23 +746,35 @@ public class CraftBlock implements Block {
return this.getBlockPower(BlockFace.SELF);
@@ -478,23 +718,35 @@ public class CraftBlock implements Block {

@Override
public PistonMoveReaction getPistonMoveReaction() {
Expand Down Expand Up @@ -919,7 +884,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
}

@Override
@@ -506,84 +786,147 @@ public class CraftBlock implements Block {
@@ -506,84 +758,147 @@ public class CraftBlock implements Block {
public boolean breakNaturally(ItemStack item, boolean triggerEffect, boolean dropExperience, boolean forceEffect) {
// Paper end
// Order matters here, need to drop before setting to air so skulls can get their data
Expand Down Expand Up @@ -973,12 +938,12 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
+ }
+ }
+ droppedItems = true;
+ }
}
+ } else {
+ // Log if we couldn't drop XP because it wasn't a ServerLevel
+ if (dropExperience && !state.isAir()) { // Only warn if XP was requested and block wasn't air
+ org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.WARNING, "PWT: Cannot drop experience for breakNaturally: Not a ServerLevel.");
}
+ }
+ // Still trigger effects if requested and possible with LevelAccessor
+ if (triggerEffect && !state.isAir()) {
+ int eventId = (state.getBlock() instanceof net.minecraft.world.level.block.BaseFireBlock)
Expand Down Expand Up @@ -1104,7 +1069,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
}

@Override
@@ -598,31 +941,70 @@ public class CraftBlock implements Block {
@@ -598,31 +913,70 @@ public class CraftBlock implements Block {

@Override
public Collection<ItemStack> getDrops(ItemStack item, Entity entity) {
Expand Down Expand Up @@ -1185,7 +1150,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
@Override
public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
this.getCraftWorld().getBlockMetadata().setMetadata(this, metadataKey, newMetadataValue);
@@ -645,57 +1027,148 @@ public class CraftBlock implements Block {
@@ -645,57 +999,148 @@ public class CraftBlock implements Block {

@Override
public boolean isPassable() {
Expand Down Expand Up @@ -1357,7 +1322,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
}

@Override
@@ -711,7 +1184,10 @@ public class CraftBlock implements Block {
@@ -711,7 +1156,10 @@ public class CraftBlock implements Block {
// Paper start
@Override
public com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup() {
Expand All @@ -1369,7 +1334,7 @@ index dd122bbbe2c33183017dbde6997d3f1cd08479b5..4d8c87bd55e3503a84ad9a24b04a11a4
}

@Override
@@ -724,26 +1200,76 @@ public class CraftBlock implements Block {
@@ -724,26 +1172,76 @@ public class CraftBlock implements Block {
return this.getNMS().getBlock().getDescriptionId();
}

Expand Down Expand Up @@ -1542,7 +1507,7 @@ index 18f09de5c6549df3562e710ede825f75d69c046e..1b06f97caeda6f33938ff5391ecaad5a
}

diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 658385b2887d6debec7fc941c28621da5d263411..2e7ee5faf114e9b8619826c0252c5daac333f0b5 100644
index 5d83fd5aafb69ac4fc6a3584417194bb67617e6a..b6b1930f377b2eab9c067ab901b876bca82212ec 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -829,6 +829,28 @@ public class CraftEventFactory {
Expand Down