mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 20:53:09 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
34 lines
2 KiB
Diff
34 lines
2 KiB
Diff
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 065d6164b5c9d65d20e7790c607d77e9ad70dfef..0e5a47ab235d99e6cb1468905f791c2c59ac0082 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, (Block) 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 iblockdata, Level world, BlockPos blockposition, BlockState iblockdata1, boolean flag, UseOnContext context) {
|
|
super.onPlace(iblockdata, world, blockposition, iblockdata1, flag, context);
|
|
// 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) {
|
|
- 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
|