mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-22 12:54:49 +02:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
37 lines
2.0 KiB
Diff
37 lines
2.0 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 a3021fbc570ae47eb6b0d4a89388c8ed893aced7..2c7847aebabe14da44b9a42f5ecae77858fb9dd3 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)) {
|
|
this.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
|