Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Add fire-tick-delay option

Browse Source
This commit is contained in:
VytskaLT 2022-06-22 14:34:28 +03:00
parent d9db4d694b
commit 8c11cd85e3
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
paper-server/patches/sources/net/minecraft/world/level/block/FireBlock.java.patch
View File

@ -48,8 +48,12 @@
} }
@Override @Override
@@ -149,7 +174,7 @@ @@ -146,10 +171,10 @@
world.scheduleTick(pos, (Block) this, FireBlock.getFireTickDelay(world.random));
@Override
protected void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
- world.scheduleTick(pos, (Block) this, FireBlock.getFireTickDelay(world.random));
+ world.scheduleTick(pos, (Block) this, FireBlock.getFireTickDelay(world)); // Paper - Add fire-tick-delay option
if (world.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) { if (world.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
if (!state.canSurvive(world, pos)) { if (!state.canSurvive(world, pos)) {
- world.removeBlock(pos, false); - world.removeBlock(pos, false);
@ -178,7 +182,7 @@
} }
} }
@@ -310,9 +368,11 @@ @@ -310,13 +368,15 @@
} }
@Override @Override
@ -189,7 +193,13 @@
+ protected void onPlace(BlockState iblockdata, Level world, BlockPos blockposition, BlockState iblockdata1, boolean flag, UseOnContext context) { + protected void onPlace(BlockState iblockdata, Level world, BlockPos blockposition, BlockState iblockdata1, boolean flag, UseOnContext context) {
+ super.onPlace(iblockdata, world, blockposition, iblockdata1, flag, context); + super.onPlace(iblockdata, world, blockposition, iblockdata1, flag, context);
+ // CraftBukkit end + // CraftBukkit end
+ world.scheduleTick(blockposition, (Block) this, FireBlock.getFireTickDelay(world.random)); + world.scheduleTick(blockposition, (Block) this, FireBlock.getFireTickDelay(world)); // Paper - Add fire-tick-delay option
} }
private static int getFireTickDelay(RandomSource random) { - private static int getFireTickDelay(RandomSource random) {
- return 30 + random.nextInt(10);
+ private static int getFireTickDelay(Level world) { // Paper - Add fire-tick-delay option
+ return world.paperConfig().environment.fireTickDelay + world.random.nextInt(10); // Paper - Add fire-tick-delay option
}
@Override