SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/minecraft/world/level/material

Browse Source
This commit is contained in:
Owen1212055
2024-12-14 16:49:54 -05:00
parent 9524c006d7
commit 4707f46b25
5 changed files with 174 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
paper-server/patches/sources/net/minecraft/world/level/material/FlowingFluid.java.patch Normal file
View File

@@ -0,0 +1,137 @@
--- a/net/minecraft/world/level/material/FlowingFluid.java
+++ b/net/minecraft/world/level/material/FlowingFluid.java
@@ -118,6 +_,15 @@
FluidState newLiquid = this.getNewLiquid(level, blockPos, blockState1);
Fluid type = newLiquid.getType();
if (fluidState1.canBeReplacedWith(level, blockPos, type, Direction.DOWN) && canHoldSpecificFluid(level, blockPos, blockState1, type)) {
+ // CraftBukkit start
+ org.bukkit.block.Block source = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos);
+ org.bukkit.event.block.BlockFromToEvent event = new org.bukkit.event.block.BlockFromToEvent(source, org.bukkit.block.BlockFace.DOWN);
+ level.getCraftServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
this.spreadTo(level, blockPos, blockState1, Direction.DOWN, newLiquid);
if (this.sourceNeighborCount(level, pos) >= 3) {
this.spreadToSides(level, pos, fluidState, blockState);
@@ -146,7 +_,18 @@
Direction direction = entry.getKey();
FluidState fluidState1 = entry.getValue();
BlockPos blockPos = pos.relative(direction);
- this.spreadTo(level, blockPos, level.getBlockState(blockPos), direction, fluidState1);
+ final BlockState blockStateIfLoaded = level.getBlockStateIfLoaded(blockPos); // Paper - Prevent chunk loading from fluid flowing
+ if (blockStateIfLoaded == null) continue; // Paper - Prevent chunk loading from fluid flowing
+ // CraftBukkit start
+ org.bukkit.block.Block source = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos);
+ org.bukkit.event.block.BlockFromToEvent event = new org.bukkit.event.block.BlockFromToEvent(source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(direction));
+ level.getCraftServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
+ this.spreadTo(level, blockPos, blockStateIfLoaded, direction, fluidState1); // Paper - Prevent chunk loading from fluid flowing
}
}
}
@@ -158,7 +_,8 @@
for (Direction direction : Direction.Plane.HORIZONTAL) {
BlockPos blockPos = mutableBlockPos.setWithOffset(pos, direction);
- BlockState blockState = level.getBlockState(blockPos);
+ BlockState blockState = level.getBlockStateIfLoaded(mutableBlockPos); // Paper - Prevent chunk loading from fluid flowing
+ if (blockState == null) continue; // Paper - Prevent chunk loading from fluid flowing
FluidState fluidState = blockState.getFluidState();
if (fluidState.getType().isSame(this) && canPassThroughWall(direction, level, pos, state, blockPos, blockState)) {
if (fluidState.isSource()) {
@@ -252,13 +_,14 @@
liquidBlockContainer.placeLiquid(level, pos, blockState, fluidState);
} else {
if (!blockState.isAir()) {
- this.beforeDestroyingBlock(level, pos, blockState);
+ this.beforeDestroyingBlock(level, pos, blockState, pos.relative(direction.getOpposite())); // Paper - Add BlockBreakBlockEvent
}
level.setBlock(pos, fluidState.createLegacyBlock(), 3);
}
}
+ protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) { beforeDestroyingBlock(world, pos, state); } // Paper - Add BlockBreakBlockEvent
protected abstract void beforeDestroyingBlock(LevelAccessor level, BlockPos pos, BlockState state);
protected int getSlopeDistance(LevelReader level, BlockPos pos, int depth, Direction direction, BlockState state, FlowingFluid.SpreadContext spreadContext) {
@@ -267,7 +_,8 @@
for (Direction direction1 : Direction.Plane.HORIZONTAL) {
if (direction1 != direction) {
BlockPos blockPos = pos.relative(direction1);
- BlockState blockState = spreadContext.getBlockState(blockPos);
+ BlockState blockState = spreadContext.getBlockStateIfLoaded(blockPos); // Paper - Prevent chunk loading from fluid flowing
+ if (blockState == null) continue; // Paper - Prevent chunk loading from fluid flowing
FluidState fluidState = blockState.getFluidState();
if (this.canPassThrough(level, this.getFlowing(), pos, state, direction1, blockPos, blockState, fluidState)) {
if (spreadContext.isHole(blockPos)) {
@@ -334,7 +_,8 @@
for (Direction direction : Direction.Plane.HORIZONTAL) {
BlockPos blockPos = pos.relative(direction);
- BlockState blockState = level.getBlockState(blockPos);
+ BlockState blockState = level.getBlockStateIfLoaded(blockPos); // Paper - Prevent chunk loading from fluid flowing
+ if (blockState == null) continue; // Paper - Prevent chunk loading from fluid flowing
FluidState fluidState = blockState.getFluidState();
if (this.canMaybePassThrough(level, pos, state, direction, blockPos, blockState, fluidState)) {
FluidState newLiquid = this.getNewLiquid(level, blockPos, blockState);
@@ -405,10 +_,24 @@
if (newLiquid.isEmpty()) {
fluidState = newLiquid;
blockState = Blocks.AIR.defaultBlockState();
+ // CraftBukkit start
+ org.bukkit.event.block.FluidLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFluidLevelChangeEvent(level, pos, blockState);
+ if (event.isCancelled()) {
+ return;
+ }
+ blockState = ((org.bukkit.craftbukkit.block.data.CraftBlockData) event.getNewData()).getState();
+ // CraftBukkit end
level.setBlock(pos, blockState, 3);
} else if (!newLiquid.equals(fluidState)) {
fluidState = newLiquid;
blockState = newLiquid.createLegacyBlock();
+ // CraftBukkit start
+ org.bukkit.event.block.FluidLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFluidLevelChangeEvent(level, pos, blockState);
+ if (event.isCancelled()) {
+ return;
+ }
+ blockState = ((org.bukkit.craftbukkit.block.data.CraftBlockData) event.getNewData()).getState();
+ // CraftBukkit end
level.setBlock(pos, blockState, 3);
level.scheduleTick(pos, newLiquid.getType(), spreadDelay);
}
@@ -476,9 +_,26 @@
public BlockState getBlockState(BlockPos pos) {
return this.getBlockState(pos, this.getCacheKey(pos));
}
+ // Paper start - Prevent chunk loading from fluid flowing
+ public @javax.annotation.Nullable BlockState getBlockStateIfLoaded(BlockPos pos) {
+ return this.getBlockState(pos, this.getCacheKey(pos), false);
+ }
+ // Paper end - Prevent chunk loading from fluid flowing
private BlockState getBlockState(BlockPos pos, short cacheKey) {
- return this.stateCache.computeIfAbsent(cacheKey, s -> this.level.getBlockState(pos));
+ // Paper start - Prevent chunk loading from fluid flowing
+ return getBlockState(pos, cacheKey, true);
+ }
+ private @javax.annotation.Nullable BlockState getBlockState(BlockPos pos, short packed, boolean load) {
+ BlockState blockState = this.stateCache.get(packed);
+ if (blockState == null) {
+ blockState = load ? level.getBlockState(pos) : level.getBlockStateIfLoaded(pos);
+ if (blockState != null) {
+ this.stateCache.put(packed, blockState);
+ }
+ }
+ return blockState;
+ // Paper end - Prevent chunk loading from fluid flowing
}
public boolean isHole(BlockPos pos) {

23
paper-server/patches/sources/net/minecraft/world/level/material/FluidState.java.patch Normal file
View File

@@ -0,0 +1,23 @@
--- a/net/minecraft/world/level/material/FluidState.java
+++ b/net/minecraft/world/level/material/FluidState.java
@@ -26,9 +_,11 @@
public static final Codec<FluidState> CODEC = codec(BuiltInRegistries.FLUID.byNameCodec(), Fluid::defaultFluidState).stable();
public static final int AMOUNT_MAX = 9;
public static final int AMOUNT_FULL = 8;
+ protected final boolean isEmpty; // Paper - Perf: moved from isEmpty()
public FluidState(Fluid owner, Reference2ObjectArrayMap<Property<?>, Comparable<?>> values, MapCodec<FluidState> propertiesCodec) {
super(owner, values, propertiesCodec);
+ this.isEmpty = owner.isEmpty(); // Paper - Perf: moved from isEmpty()
}
public Fluid getType() {
@@ -44,7 +_,7 @@
}
public boolean isEmpty() {
- return this.getType().isEmpty();
+ return this.isEmpty; // Paper - Perf: moved into constructor
}
public float getHeight(BlockGetter level, BlockPos pos) {

53
paper-server/patches/sources/net/minecraft/world/level/material/LavaFluid.java.patch Normal file
View File

@@ -0,0 +1,53 @@
--- a/net/minecraft/world/level/material/LavaFluid.java
+++ b/net/minecraft/world/level/material/LavaFluid.java
@@ -88,6 +_,13 @@
BlockState blockState = level.getBlockState(blockPos);
if (blockState.isAir()) {
if (this.hasFlammableNeighbours(level, blockPos)) {
+ // CraftBukkit start - Prevent lava putting something on fire
+ if (level.getBlockState(blockPos).getBlock() != Blocks.FIRE) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(level, blockPos, pos).isCancelled()) {
+ continue;
+ }
+ }
+ // CraftBukkit end
level.setBlockAndUpdate(blockPos, BaseFireBlock.getState(level, blockPos));
return;
}
@@ -103,6 +_,14 @@
}
if (level.isEmptyBlock(blockPos1.above()) && this.isFlammable(level, blockPos1)) {
+ // CraftBukkit start - Prevent lava putting something on fire
+ BlockPos up = blockPos1.above();
+ if (level.getBlockState(up).getBlock() != Blocks.FIRE) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(level, up, pos).isCancelled()) {
+ continue;
+ }
+ }
+ // CraftBukkit end
level.setBlockAndUpdate(blockPos1.above(), BaseFireBlock.getState(level, blockPos1));
}
}
@@ -195,7 +_,11 @@
FluidState fluidState1 = level.getFluidState(pos);
if (this.is(FluidTags.LAVA) && fluidState1.is(FluidTags.WATER)) {
if (blockState.getBlock() instanceof LiquidBlock) {
- level.setBlock(pos, Blocks.STONE.defaultBlockState(), 3);
+ // CraftBukkit start
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level.getMinecraftWorld(), pos, Blocks.STONE.defaultBlockState(), 3)) {
+ return;
+ }
+ // CraftBukkit end
}
this.fizz(level, pos);
@@ -213,7 +_,7 @@
@Override
protected float getExplosionResistance() {
- return 100.0F;
+ return Blocks.LAVA.getExplosionResistance(); // Paper - Get explosion resistance from actual block
}
@Override

26
paper-server/patches/sources/net/minecraft/world/level/material/WaterFluid.java.patch Normal file
View File

@@ -0,0 +1,26 @@
--- a/net/minecraft/world/level/material/WaterFluid.java
+++ b/net/minecraft/world/level/material/WaterFluid.java
@@ -74,7 +_,13 @@
protected boolean canConvertToSource(ServerLevel level) {
return level.getGameRules().getBoolean(GameRules.RULE_WATER_SOURCE_CONVERSION);
}
-
+ // Paper start - Add BlockBreakBlockEvent
+ @Override
+ protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) {
+ BlockEntity tileentity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
+ Block.dropResources(state, world, pos, tileentity, source);
+ }
+ // Paper end - Add BlockBreakBlockEvent
@Override
protected void beforeDestroyingBlock(LevelAccessor level, BlockPos pos, BlockState state) {
BlockEntity blockEntity = state.hasBlockEntity() ? level.getBlockEntity(pos) : null;
@@ -113,7 +_,7 @@
@Override
protected float getExplosionResistance() {
- return 100.0F;
+ return Blocks.WATER.getExplosionResistance(); // Paper - Get explosion resistance from actual block
}
@Override