aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0762-Add-fire-tick-delay-option.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0762-Add-fire-tick-delay-option.patch')
-rw-r--r--patches/server/0762-Add-fire-tick-delay-option.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/patches/server/0762-Add-fire-tick-delay-option.patch b/patches/server/0762-Add-fire-tick-delay-option.patch
new file mode 100644
index 0000000000..848f831f0e
--- /dev/null
+++ b/patches/server/0762-Add-fire-tick-delay-option.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: VytskaLT <[email protected]>
+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 5dad1aa26a8908cba6a08398a4bad27f31d4c2c0..4d467ecf0dd8006b9fa4fb8fb5aadc0622a1e512 100644
+--- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
+@@ -171,7 +171,7 @@ public class FireBlock extends BaseFireBlock {
+
+ @Override
+ protected void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
+- world.scheduleTick(pos, (Block) this, FireBlock.getFireTickDelay(world.random));
++ world.scheduleTick(pos, this, FireBlock.getFireTickDelay(world)); // Paper - Add fire-tick-delay option
+ if (world.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
+ if (!state.canSurvive(world, pos)) {
+ this.fireExtinguished(world, pos); // CraftBukkit - invalid place location
+@@ -372,11 +372,11 @@ public class FireBlock extends BaseFireBlock {
+ protected void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify, net.minecraft.world.item.context.UseOnContext context) {
+ super.onPlace(state, world, pos, oldState, notify, context);
+ // Paper end - UseOnContext param
+- world.scheduleTick(pos, (Block) this, FireBlock.getFireTickDelay(world.random));
++ world.scheduleTick(pos, this, FireBlock.getFireTickDelay(world)); // Paper - Add fire-tick-delay option
+ }
+
+- 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