mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-01 16:07:36 +02:00
275173e538
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends 255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot CraftBukkit Changes: b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd 44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot 676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory
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 7f88b910dfd0303f69b4fd1c7918a401c1f369f2..4002e0fffb60556e7af1aeff71b4be244f02b0f5 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)) {
|
|
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
|