From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: VytskaLT Date: Wed, 22 Jun 2022 14:34:28 +0300 Subject: [PATCH] Add fire-tick-delay option diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java index 7f88b910dfd0303f69b4fd1c7918a401c1f369f2..4002e0fffb60556e7af1aeff71b4be244f02b0f5 100644 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java @@ -165,7 +165,7 @@ public class FireBlock extends BaseFireBlock { @Override public 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 if (world.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) { if (!state.canSurvive(world, pos)) { fireExtinguished(world, pos); // CraftBukkit - invalid place location @@ -366,11 +366,13 @@ public class FireBlock extends BaseFireBlock { public void onPlace(BlockState iblockdata, Level world, BlockPos blockposition, BlockState iblockdata1, boolean flag, UseOnContext itemActionContext) { super.onPlace(iblockdata, world, blockposition, iblockdata1, flag, itemActionContext); // Paper end - world.scheduleTick(blockposition, this, getFireTickDelay(world.random)); + world.scheduleTick(blockposition, this, getFireTickDelay(world)); // Paper } - private static int getFireTickDelay(RandomSource random) { - return 30 + random.nextInt(10); + // Paper start - customisable fire tick delay + private static int getFireTickDelay(Level world) { + return world.paperConfig().environment.fireTickDelay + world.random.nextInt(10); + // Paper end } @Override