Address final axolotl bucket and fire review corrections

This commit is contained in:
Cosmic
2026-10-14 14:39:49 -04:00
parent f1e0b093a5
commit 027ac3cdf1
5 changed files with 37 additions and 11 deletions
+25 -4
View File
@@ -598,7 +598,7 @@ pub fn mob_from_nbt(tag: &Tag, types: &HashMap<String, Arc<MobType>>, id: u32) -
m.extra.main_hand = None;
}
m.death_time = number(tag.get("DeathTime")).unwrap_or(0) as i32;
m.persistent = flag(tag, "PersistenceRequired");
m.persistent |= flag(tag, "PersistenceRequired");
m.extra.pick_up_loot = flag(tag, "CanPickUpLoot");
m.custom_name = custom_name(tag);
if m.kind.category == "creature" {
@@ -613,7 +613,6 @@ pub fn mob_from_nbt(tag: &Tag, types: &HashMap<String, Arc<MobType>>, id: u32) -
m.ticks_frozen = number(tag.get("TicksFrozen")).unwrap_or(0) as i32;
m.silent = flag(tag, "Silent");
m.invulnerable_flag = flag(tag, "Invulnerable");
m.no_gravity = m.no_gravity || flag(tag, "NoGravity");
if m.species() == crate::mobs::Species::Creeper {
m.extra.charged = flag(tag, "powered");
}
@@ -1578,7 +1577,7 @@ pub fn bucket_data(m: &Mob) -> Tag {
("NoAI", m.no_ai),
("Silent", m.silent),
("NoGravity", m.no_gravity),
("Glowing", m.glowing || m.has_effect("glowing")),
("Glowing", m.glowing),
("Invulnerable", m.invulnerable_flag),
("PersistenceRequired", m.persistent),
] {
@@ -1632,12 +1631,12 @@ pub fn load_bucket_data(m: &mut Mob, stack: &crate::items::ItemStack) {
("NoGravity", &mut m.no_gravity),
("Glowing", &mut m.glowing),
("Invulnerable", &mut m.invulnerable_flag),
("PersistenceRequired", &mut m.persistent),
] {
if let Some(v) = number(data.get(key)) {
*flag = v != 0;
}
}
m.persistent |= flag(data, "PersistenceRequired");
if m.species() == crate::mobs::Species::Axolotl {
crate::mobs::animal_brain::set_hunting_cooldown(
m,
@@ -1746,6 +1745,28 @@ mod axolotl_nbt_tests {
);
assert_eq!(restored.custom_name.as_deref(), Some("Bucket friend"));
assert_eq!(restored.health, 5.0);
m.glowing = false;
m.add_effect("glowing", 200, 0);
assert!(m.has_effect("glowing"));
assert!(bucket_data(&m).get("Glowing").is_none());
m.glowing = true;
assert_eq!(number(bucket_data(&m).get("Glowing")), Some(1));
for (persistent, expected) in [(None, false), (Some(0), false), (Some(1), true)] {
let mut data = Tag::Compound(Compound::new());
if let Some(value) = persistent {
put(&mut data, "PersistenceRequired", Tag::Byte(value));
}
let mut bucket = crate::items::ItemStack::new("minecraft:axolotl_bucket", 1);
bucket
.data_mut()
.set_other("minecraft:bucket_entity_data", Some(data));
restored.persistent = false;
load_bucket_data(&mut restored, &bucket);
assert_eq!(restored.persistent, expected);
restored.persistent = true;
load_bucket_data(&mut restored, &bucket);
assert!(restored.persistent, "bucket data cannot clear persistence");
}
restored.ticks_frozen = 140;
restored.ignite_for_ticks(160);
assert_eq!(restored.ticks_frozen, 0);
+3 -3
View File
@@ -400,6 +400,9 @@ fn base_tick(m: &mut Mob, w: &MobWorld, events: &mut Vec<MobEvent>) {
m.fall_distance = 0.0;
}
let fire = crate::motion::environment::fire_contact(w.world, w.registry, m.bounds());
if fire > 0.0 {
m.ticks_frozen = 0;
}
if fire > 0.0 && !m.kind.flags.fire_immune {
let multiplier = m.burning_time();
m.fire_ticks = crate::motion::environment::ignite_contact(
@@ -408,9 +411,6 @@ fn base_tick(m: &mut Mob, w: &MobWorld, events: &mut Vec<MobEvent>) {
&mut m.random,
multiplier,
);
if m.fire_ticks >= 0 {
m.ticks_frozen = 0;
}
m.damage(fire, Damage::of(DamageKind::InFire));
}
// Fire: water extinguishes, lava ignites, burning hurts every second.
@@ -1444,7 +1444,7 @@ impl B {
});
mm.look_target.set(Tracker::Entity {
who: adult,
eye: eyes,
eye: true,
block_eye: eyes,
});
true
+7
View File
@@ -2074,12 +2074,17 @@ mod tests {
w.player.velocity = Vec3::ZERO;
w.player.fire_ticks = -20;
w.player.health.hurt.cooldown = 0;
w.player.ticks_frozen = 140;
let hp = w.player.health.health();
w.controlled_simulation_tick(Default::default()).unwrap();
assert!(
w.player.fire_ticks < 0,
"direct fire hurts during the immunity delay"
);
assert_eq!(
w.player.ticks_frozen, 0,
"fire contact clears freeze during the delay"
);
assert!(w.player.health.health() < hp);
w.player.status.fire_resistance = true;
w.player.health.hurt.cooldown = 0;
@@ -2088,7 +2093,9 @@ mod tests {
assert_eq!(w.player.health.health(), hp);
w.player.invulnerable = true;
w.player.fire_ticks = -20;
w.player.ticks_frozen = 140;
w.controlled_simulation_tick(Default::default()).unwrap();
assert_eq!(w.player.ticks_frozen, 0);
assert_eq!(
w.player.fire_ticks, -19,
"creative preserves the fire-contact delay"
@@ -110,6 +110,7 @@ impl MotionWorld<'_, '_, '_> {
}
let damage = fire_contact(self.scene, self.assets.registry, self.player.bounds());
if damage > 0.0 {
self.player.ticks_frozen = 0;
if !self.player.in_water {
let multiplier = self.player.attribute("minecraft:burning_time")?;
let ticks = ignite_contact(
@@ -119,9 +120,6 @@ impl MotionWorld<'_, '_, '_> {
multiplier,
);
self.player.set_remaining_fire_ticks(ticks);
if ticks >= 0 {
self.player.ticks_frozen = 0;
}
}
self.environment_hurt("minecraft:in_fire", damage)?;
} else if self.player.fire_ticks <= 0 {