mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 08:57:35 +01:00
dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
35 lines
2.0 KiB
Diff
35 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 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
|