majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-31 08:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix fire overflow (#945)

Browse Source 
* Add Fire

* fixes

* fix dropping blocks

* fix logic

* Fix CI

* add support for waterlogged

* fmt

* fix comment

* remove particles and sound from fire breaking

* fmt

* fix overflow

* fix merge error
This commit is contained in:
teknostom
2025-06-27 20:43:48 +02:00
committed by GitHub
parent 2333d6b959
commit cd1df40d0d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pumpkin/src/block/blocks/fire/fire.rs
View File

@@ -146,7 +146,7 @@ impl FireBlock {
}
}
pub async fn get_burn_chance(&self, world: &Arc<World>, pos: &BlockPos) -> u8 {
pub async fn get_burn_chance(&self, world: &Arc<World>, pos: &BlockPos) -> i32 {
let block_state = world.get_block_state(pos).await;
if !block_state.is_air() {
return 0;
@@ -159,7 +159,7 @@ impl FireBlock {
continue; // Skip if there is a fluid
}
if let Some(flammable) = neighbor_block.flammable {
total_burn_chance += flammable.burn_chance;
total_burn_chance += i32::from(flammable.burn_chance);
}
}
@@ -405,11 +405,10 @@ impl PumpkinBlock for FireBlock {
let burn_chance = Self.get_burn_chance(world, &offset_pos).await;
if burn_chance > 0 {
let o = 100 + if n > 1 { (n - 1) * 100 } else { 0 };
let p: i32 = i32::from(
burn_chance
+ 40
+ world.level_info.read().await.difficulty.to_int() * 7,
) / i32::from(age + 30);
let p: i32 = burn_chance
+ 40
+ i32::from(world.level_info.read().await.difficulty.to_int()) * 7
/ i32::from(age + 30);
if p > 0 && rand::rng().random_range(0..o) <= p {
let new_age = (age + rand::rng().random_range(0..5) / 4).min(15);