Paper/patches/server/0844-Add-fire-tick-delay-option.patch

37 lines
2.0 KiB
Diff
Raw Normal View History

2022-10-23 00:57:09 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: VytskaLT <VytskaLT@protonmail.com>
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 3fb197ee3bfd3f36881b7d67f7a37f035bb27daf..03310fe5d05bc9c61df221977c071757a488c352 100644
2022-10-23 00:57:09 +02:00
--- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
2023-12-06 17:21:56 +01:00
@@ -172,7 +172,7 @@ public class FireBlock extends BaseFireBlock {
2022-10-23 00:57:09 +02:00
@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 - Add fire-tick-delay option
2022-10-23 00:57:09 +02:00
if (world.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
if (!state.canSurvive(world, pos)) {
2023-10-27 01:34:58 +02:00
this.fireExtinguished(world, pos); // CraftBukkit - invalid place location
2023-12-06 17:21:56 +01:00
@@ -373,11 +373,13 @@ public class FireBlock extends BaseFireBlock {
2022-10-23 00:57:09 +02:00
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 - Add fire-tick-delay option
2022-10-23 00:57:09 +02:00
}
- private static int getFireTickDelay(RandomSource random) {
- return 30 + random.nextInt(10);
+ // Paper start - Add fire-tick-delay option
2022-10-23 00:57:09 +02:00
+ private static int getFireTickDelay(Level world) {
+ return world.paperConfig().environment.fireTickDelay + world.random.nextInt(10);
+ // Paper end - Add fire-tick-delay option
2022-10-23 00:57:09 +02:00
}
@Override