Merge pull request #2205 from kacpherek/fix/turtle-eggs
🤖 Agent: Gate check by Ludovic's AI agent (Claude). Checked against 26.3: turtles lay (`TurtleLayEggGoal` with the digging effect), `TurtleEggBlock` hatches, and a growing baby drops a scute. I pushed one fix: the home is set at spawn and kept on load (`finalizeSpawn`, `home_pos`), and breeding drops one orb of 1 to 7, drawn from the mother's random and only with `mob_drops`. After #2137 the gift loot event names its mob. I merged main into your branch (6ef61ac13): main's `Reinforcements` stays beside your `BlockBreakEffect`, and the grown scute now goes through #2137's `drop_gift_loot` (the turtle's id added to both `GiftLoot` events) behind your mob_drops check; clippy clean, same code as the tested tree. Gate: this wave's 55 PRs merged on main in one tree: clippy `-D warnings` clean, 1186 horizon-client and 163 horizon-world tests pass, and of the 101 harnesses `parity.py --changed-files` picked, 100 pass (`block_removal` failed on one spawner case from #2199's orb merging, fixed there). `lan_e2e.py` passes 24 checks with the host on its server thread and in-frame (chest, xp, pvp, doors, villagers, beds, frames, projectiles, arrows, fishing, damage, mobs, blast, drops, elytra, breath, predict, cracks, barter, kills, hurt, contacts, underwater, plates), plus forced-levels on the server thread. Thanks @kacpherek!
This commit is contained in:
@@ -370,6 +370,12 @@ pub fn mob_to_nbt(m: &Mob, uuid: [i32; 4], raw: Option<&Tag>) -> Tag {
|
||||
"minecraft:bat" => {
|
||||
map.insert("BatFlags".into(), Tag::Byte(i8::from(m.extra.flag)));
|
||||
}
|
||||
"minecraft:turtle" => {
|
||||
map.insert("has_egg".into(), Tag::Byte(i8::from(m.extra.flag)));
|
||||
if let Some(home) = m.extra.home {
|
||||
map.insert("home_pos".into(), Tag::IntArray(home.to_vec()));
|
||||
}
|
||||
}
|
||||
"minecraft:creaking" => {
|
||||
// home_pos: the heart it is bound to.
|
||||
if let Some(home) = m.extra.home {
|
||||
@@ -876,6 +882,18 @@ pub fn mob_from_nbt(tag: &Tag, types: &HashMap<String, Arc<MobType>>, id: u32) -
|
||||
{
|
||||
crate::mobs::creaking::set_transient(&mut m, [home[0], home[1], home[2]]);
|
||||
}
|
||||
if m.species() == crate::mobs::Species::Turtle {
|
||||
// Turtle.readAdditionalSaveData: `home_pos` (else where it stands) and `has_egg`.
|
||||
m.extra.flag = flag(tag, "has_egg");
|
||||
m.extra.home = Some(match tag.get("home_pos") {
|
||||
Some(Tag::IntArray(home)) if home.len() == 3 => [home[0], home[1], home[2]],
|
||||
_ => [
|
||||
m.position.x.floor() as i32,
|
||||
m.position.y.floor() as i32,
|
||||
m.position.z.floor() as i32,
|
||||
],
|
||||
});
|
||||
}
|
||||
if m.species() == crate::mobs::Species::Wither {
|
||||
m.extra.counter = number(tag.get("Invul")).unwrap_or(0) as i32;
|
||||
}
|
||||
|
||||
@@ -3113,6 +3113,11 @@ impl Game<'_> {
|
||||
kind: "hatch_sniffer",
|
||||
..
|
||||
} => self.hatch_sniffer([pos.x, pos.y, pos.z]),
|
||||
LevelEvent::BlockEvent {
|
||||
pos,
|
||||
state,
|
||||
kind: "hatch_turtles",
|
||||
} => self.hatch_turtles([pos.x, pos.y, pos.z], state),
|
||||
LevelEvent::BlockEvent {
|
||||
pos,
|
||||
kind: "portal_spawn",
|
||||
|
||||
@@ -1289,6 +1289,10 @@ impl Game<'_> {
|
||||
self.mob_vibration_particle(from, to, ticks)
|
||||
}
|
||||
MobEvent::DigParticles { at } => self.warden_dig_particles(at),
|
||||
MobEvent::BlockBreakEffect { pos, block } => {
|
||||
let state = self.world.block(block[0], block[1], block[2]);
|
||||
self.destroy_particles(pos, state);
|
||||
}
|
||||
MobEvent::Darkness { at, radius } => self.apply_darkness(at, radius),
|
||||
MobEvent::CreakingHurt {
|
||||
home,
|
||||
@@ -1327,11 +1331,51 @@ impl Game<'_> {
|
||||
m.ai.aggressive |= aggressive;
|
||||
}
|
||||
}
|
||||
MobEvent::GiftLoot { mob, table, at } => self.drop_gift_loot(mob, table, at),
|
||||
MobEvent::GiftLoot { mob, table, at } => {
|
||||
// Turtle.ageBoundaryReached: only with mob loot on.
|
||||
if table == "minecraft:gameplay/turtle_grow" && !self.ui.rules.bool("mob_drops")
|
||||
{
|
||||
continue;
|
||||
}
|
||||
self.drop_gift_loot(mob, table, at);
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
/// `TurtleEggBlock.randomTick` at the last hatch stage: one baby turtle
|
||||
/// per egg, a day from grown, with the egg as its home (the sound, the
|
||||
/// crumbs and the block's removal came from the level).
|
||||
pub(super) fn hatch_turtles(
|
||||
&mut self,
|
||||
pos: [i32; 3],
|
||||
state: horizon_world::registry::BlockStateId,
|
||||
) {
|
||||
let eggs = self
|
||||
.pack
|
||||
.assets
|
||||
.registry
|
||||
.state(state)
|
||||
.and_then(|s| s.properties.get("eggs"))
|
||||
.and_then(|v| v.parse::<i32>().ok())
|
||||
.unwrap_or(1);
|
||||
for i in 0..eggs {
|
||||
let at = [
|
||||
f64::from(pos[0]) + 0.3 + f64::from(i) * 0.2,
|
||||
f64::from(pos[1]),
|
||||
f64::from(pos[2]) + 0.3,
|
||||
];
|
||||
if let Some(id) = self.spawn_mob("minecraft:turtle", at, true)
|
||||
&& let Some(m) = self.mobs.iter_mut().find(|m| m.id == id)
|
||||
{
|
||||
m.extra.age = -24000;
|
||||
m.extra.home = Some(pos);
|
||||
m.yaw = 0.0;
|
||||
m.body_yaw = 0.0;
|
||||
m.head_yaw = 0.0;
|
||||
}
|
||||
}
|
||||
}
|
||||
fn apply_setup(&mut self, id: u32, setup: &SpawnSetup) {
|
||||
let Some(m) = self.mobs.iter_mut().find(|m| m.id == id) else {
|
||||
return;
|
||||
@@ -1394,6 +1438,8 @@ impl Game<'_> {
|
||||
.unwrap_or_else(|| parent.clone());
|
||||
let mut child = parent.clone();
|
||||
child.baby = true;
|
||||
// TurtleBreedGoal.breed triggers it without a child.
|
||||
let turtle = p.species() == Species::Turtle;
|
||||
if matches!(
|
||||
(
|
||||
p.species(),
|
||||
@@ -1406,7 +1452,7 @@ impl Game<'_> {
|
||||
) {
|
||||
child.kind = "minecraft:mule".into();
|
||||
}
|
||||
self.trigger_bred(&parent, &partner_view, Some(&child));
|
||||
self.trigger_bred(&parent, &partner_view, (!turtle).then_some(&child));
|
||||
}
|
||||
if let Some(q) = self.mobs.iter_mut().find(|m| m.id == partner) {
|
||||
q.extra.age = 6000;
|
||||
@@ -1418,6 +1464,19 @@ impl Game<'_> {
|
||||
self.lay_sniffer_egg(&p);
|
||||
return;
|
||||
}
|
||||
// TurtleBreedGoal.breed: the goal gave the mother her egg; only the
|
||||
// experience is left, and only with mob loot on.
|
||||
if p.species() == Species::Turtle {
|
||||
// One `new ExperienceOrb` of 1 to 7 from the mother's random (not
|
||||
// split up as `ExperienceOrb.award` does).
|
||||
if self.ui.rules.bool("mob_drops")
|
||||
&& let Some(m) = self.mobs.iter_mut().find(|m| m.id == parent)
|
||||
{
|
||||
let xp = 1 + m.random.next_int_bound(7).unwrap_or(0) as u32;
|
||||
self.add_orb([p.position.x, p.position.y, p.position.z], xp);
|
||||
}
|
||||
return;
|
||||
}
|
||||
let coin = self.world.random.next_int_bound(2).unwrap_or(0) == 0;
|
||||
let coin2 = self.world.random.next_int_bound(2).unwrap_or(0) == 0;
|
||||
// A horse and a donkey have a mule.
|
||||
@@ -2695,6 +2754,7 @@ impl Game<'_> {
|
||||
let mut handled = true;
|
||||
let mut drops: Vec<(String, u32)> = Vec::new();
|
||||
let is_food = m.kind.food.contains(&item);
|
||||
let baby_turtle = species == Species::Turtle && m.is_baby();
|
||||
match species {
|
||||
Species::Cow | Species::Mooshroom if item == "minecraft:bucket" && !m.is_baby() => {
|
||||
give = Some("minecraft:milk_bucket");
|
||||
@@ -2984,6 +3044,14 @@ impl Game<'_> {
|
||||
if !handled {
|
||||
return Ok(false);
|
||||
}
|
||||
// Turtle.ageBoundaryReached: food that finishes a baby's growth.
|
||||
if baby_turtle && !self.mobs[index].is_baby() {
|
||||
self.handle_mob_events(vec![MobEvent::GiftLoot {
|
||||
mob: self.mobs[index].id,
|
||||
table: "minecraft:gameplay/turtle_grow",
|
||||
at: feet,
|
||||
}])?;
|
||||
}
|
||||
self.swing_arm();
|
||||
if let Some(s) = sound {
|
||||
let pitch =
|
||||
|
||||
@@ -69,6 +69,7 @@ pub mod tame;
|
||||
pub mod trader;
|
||||
pub mod transport_items;
|
||||
pub mod trial_spawner;
|
||||
pub mod turtle;
|
||||
pub mod undead;
|
||||
pub mod vex;
|
||||
pub mod villager;
|
||||
@@ -1203,6 +1204,12 @@ pub enum MobEvent {
|
||||
mob: u32,
|
||||
target: Who,
|
||||
},
|
||||
/// `LevelEvent.PARTICLES_DESTROY_BLOCK` (2001) at `pos` for the block at
|
||||
/// `block`: a turtle's digging.
|
||||
BlockBreakEffect {
|
||||
pos: [i32; 3],
|
||||
block: [i32; 3],
|
||||
},
|
||||
/// `Warden.applyDarknessAround`: darkness for survival players nearby.
|
||||
Darkness {
|
||||
at: [f64; 3],
|
||||
|
||||
@@ -183,6 +183,9 @@ pub fn register(m: &mut Mob) {
|
||||
if m.species() == Species::Rabbit {
|
||||
super::rabbit::register(m);
|
||||
}
|
||||
if m.species() == Species::Turtle {
|
||||
super::turtle::register(m);
|
||||
}
|
||||
}
|
||||
Family::Inert => {}
|
||||
Family::Witch => super::witch::register(m),
|
||||
@@ -712,6 +715,14 @@ fn ai_step(m: &mut Mob, w: &MobWorld, level_random: &mut LegacyRandom, events: &
|
||||
// setAge at the age boundary: refreshDimensions.
|
||||
if m.extra.age >= 0 {
|
||||
m.fudge_position_after_size_change(w, bw, bh);
|
||||
// Turtle.ageBoundaryReached: a grown turtle drops a scute.
|
||||
if m.species() == Species::Turtle {
|
||||
events.push(MobEvent::GiftLoot {
|
||||
mob: m.id,
|
||||
table: "minecraft:gameplay/turtle_grow",
|
||||
at: [m.position.x, m.position.y, m.position.z],
|
||||
});
|
||||
}
|
||||
}
|
||||
} else if m.extra.age > 0 {
|
||||
m.extra.age -= 1;
|
||||
@@ -1005,6 +1016,7 @@ fn species_ai_step(
|
||||
}
|
||||
Species::Nautilus | Species::ZombieNautilus => super::nautilus::ai_step(m, w, events),
|
||||
Species::Chicken => farm::chicken_ai_step(m, w, events),
|
||||
Species::Turtle => super::turtle::ai_step(m, w, events),
|
||||
Species::Sheep if m.extra.anim_ticks > 0 => {
|
||||
m.extra.anim_ticks -= 1;
|
||||
}
|
||||
|
||||
@@ -969,8 +969,8 @@ pub fn anim(m: &Mob, s: &State, p: &mut Poses, a: &Animations) -> bool {
|
||||
s,
|
||||
&Turtle {
|
||||
on_land: !m.fluids.in_water && m.on_ground,
|
||||
laying_egg: false,
|
||||
has_egg: false,
|
||||
laying_egg: m.extra.flag2,
|
||||
has_egg: m.extra.flag,
|
||||
},
|
||||
),
|
||||
Species::Strider => strider(p, s, m.rider.is_some()),
|
||||
|
||||
@@ -1791,6 +1791,10 @@ impl Goal for Breed {
|
||||
if tamable && (!m.extra.tame || m.extra.sitting) {
|
||||
return false;
|
||||
}
|
||||
// TurtleBreedGoal.canUse: not while carrying an egg.
|
||||
if species == Species::Turtle && super::turtle::has_egg(m) {
|
||||
return false;
|
||||
}
|
||||
let id = m.id;
|
||||
// Horses and donkeys breed together (AbstractHorse.canParent: tame).
|
||||
// Sniffer.canMate: calm states only.
|
||||
@@ -1869,6 +1873,10 @@ impl Goal for Breed {
|
||||
});
|
||||
m.extra.in_love = 0;
|
||||
m.extra.age = 6000;
|
||||
// TurtleBreedGoal.breed: the mother carries an egg, not a baby.
|
||||
if m.species() == Species::Turtle {
|
||||
m.extra.flag = true;
|
||||
}
|
||||
cx.events.push(MobEvent::Breed {
|
||||
parent: m.id,
|
||||
partner: p.id,
|
||||
|
||||
@@ -153,6 +153,14 @@ pub fn finalize(m: &mut Mob, biome: &BiomeFacts, difficulty: &LocalDifficulty) {
|
||||
S::Pig | S::Cow | S::Chicken => m.extra.variant = climate_index,
|
||||
S::Sheep => m.extra.color = super::farm::sheep_color(biome.climate, &mut m.random),
|
||||
S::Mooshroom => m.extra.variant = 0,
|
||||
// Turtle.finalizeSpawn: home is where it spawned.
|
||||
S::Turtle => {
|
||||
m.extra.home = Some([
|
||||
m.position.x.floor() as i32,
|
||||
m.position.y.floor() as i32,
|
||||
m.position.z.floor() as i32,
|
||||
])
|
||||
}
|
||||
S::Frog => m.extra.variant = biome.frog,
|
||||
S::Wolf => m.extra.variant = biome.wolf,
|
||||
S::Cat => m.extra.variant = super::tame::cat_variant(m, biome.full_moon),
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
//! Turtles (`Turtle`): the egg a bred mother carries (`TurtleBreedGoal`), her
|
||||
//! walk home (`TurtleGoHomeGoal`) and the egg she digs into the sand
|
||||
//! (`TurtleLayEggGoal`). `extra.flag` is `hasEgg`, `extra.flag2` `isLayingEgg`,
|
||||
//! `extra.counter` `layEggCounter` and `extra.home` `homePos`.
|
||||
use super::{
|
||||
Mob, MobEvent, MobWorld,
|
||||
goals::{Breed, Cx, Goal, JUMP, MOVE, MoveToBlock, goal_clone, reduced},
|
||||
};
|
||||
use horizon_core::random::RandomSource;
|
||||
|
||||
pub fn register(m: &mut Mob) {
|
||||
let g = &mut m.ai.goals;
|
||||
g.add(1, Breed::new(1.0));
|
||||
g.add(1, LayEgg(MoveToBlock::new(1.0, 16, 1)));
|
||||
g.add(4, GoHome::default());
|
||||
}
|
||||
/// `Turtle.hasEgg`.
|
||||
pub fn has_egg(m: &Mob) -> bool {
|
||||
m.extra.flag
|
||||
}
|
||||
/// `Turtle.setLayingEgg`.
|
||||
fn set_laying_egg(m: &mut Mob, on: bool) {
|
||||
m.extra.counter = i32::from(on);
|
||||
m.extra.flag2 = on;
|
||||
}
|
||||
/// `homePos.closerToCenterThan(position, distance)`. Spawning, hatching and
|
||||
/// loading all set a home; one made any other way is at home where it stands.
|
||||
fn close_to_home(m: &Mob, distance: f64) -> bool {
|
||||
let home = m.extra.home.unwrap_or([
|
||||
m.position.x.floor() as i32,
|
||||
m.position.y.floor() as i32,
|
||||
m.position.z.floor() as i32,
|
||||
]);
|
||||
let d = [
|
||||
f64::from(home[0]) + 0.5 - m.position.x,
|
||||
f64::from(home[1]) + 0.5 - m.position.y,
|
||||
f64::from(home[2]) + 0.5 - m.position.z,
|
||||
];
|
||||
d[0] * d[0] + d[1] * d[1] + d[2] * d[2] < distance * distance
|
||||
}
|
||||
fn block_of(m: &Mob) -> [i32; 3] {
|
||||
[
|
||||
m.position.x.floor() as i32,
|
||||
m.position.y.floor() as i32,
|
||||
m.position.z.floor() as i32,
|
||||
]
|
||||
}
|
||||
/// `TurtleEggBlock.isSand`.
|
||||
fn is_sand(w: &MobWorld, p: [i32; 3]) -> bool {
|
||||
w.has_tag("minecraft:sand", w.block_name(p[0], p[1], p[2]))
|
||||
}
|
||||
/// `Turtle.aiStep`: while digging, sand crumbs fly every fifth tick.
|
||||
pub fn ai_step(m: &mut Mob, w: &MobWorld, events: &mut Vec<MobEvent>) {
|
||||
if m.alive() && m.extra.flag2 && m.extra.counter >= 1 && m.extra.counter % 5 == 0 {
|
||||
let at = block_of(m);
|
||||
let below = [at[0], at[1] - 1, at[2]];
|
||||
if is_sand(w, below) {
|
||||
events.push(MobEvent::BlockBreakEffect {
|
||||
pos: at,
|
||||
block: below,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// `Turtle.TurtleLayEggGoal`: a mother with an egg within 9 blocks of home
|
||||
/// walks to sand with air above, digs for 200 ticks and lays it.
|
||||
#[derive(Clone, Debug)]
|
||||
struct LayEgg(MoveToBlock);
|
||||
impl LayEgg {
|
||||
/// `isValidTarget`: sand with air above it.
|
||||
fn valid(w: &MobWorld, p: [i32; 3]) -> bool {
|
||||
w.facts.is_air(w.world.block(p[0], p[1] + 1, p[2])) && is_sand(w, p)
|
||||
}
|
||||
}
|
||||
impl Goal for LayEgg {
|
||||
goal_clone!();
|
||||
fn flags(&self) -> u8 {
|
||||
MOVE | JUMP
|
||||
}
|
||||
fn name(&self) -> &'static str {
|
||||
"TurtleLayEggGoal"
|
||||
}
|
||||
fn every_tick(&self) -> bool {
|
||||
true
|
||||
}
|
||||
fn can_use(&mut self, m: &mut Mob, cx: &mut Cx) -> bool {
|
||||
if !(has_egg(m) && close_to_home(m, 9.0)) {
|
||||
return false;
|
||||
}
|
||||
// MoveToBlockGoal.canUse.
|
||||
if self.0.next_start > 0 {
|
||||
self.0.next_start -= 1;
|
||||
return false;
|
||||
}
|
||||
self.0.next_start = reduced(200 + m.random.next_int_bound(200).unwrap_or(0));
|
||||
self.0.find_nearest(m, cx.w, Self::valid)
|
||||
}
|
||||
fn can_continue(&mut self, m: &mut Mob, cx: &mut Cx) -> bool {
|
||||
self.0.can_continue(cx.w, Self::valid) && has_egg(m) && close_to_home(m, 9.0)
|
||||
}
|
||||
fn start(&mut self, m: &mut Mob, cx: &mut Cx) {
|
||||
self.0.start(m, cx.w);
|
||||
}
|
||||
fn tick(&mut self, m: &mut Mob, cx: &mut Cx) {
|
||||
self.0.tick(m, cx.w);
|
||||
if m.fluids.in_water || !self.0.reached {
|
||||
return;
|
||||
}
|
||||
if m.extra.counter < 1 {
|
||||
set_laying_egg(m, true);
|
||||
} else if m.extra.counter > 200 {
|
||||
let at = [m.position.x, m.position.y, m.position.z];
|
||||
let pitch = 0.9 + m.random.next_float() * 0.2;
|
||||
cx.events
|
||||
.push(MobEvent::Sound("entity.turtle.lay_egg", at, 0.3, pitch));
|
||||
// Blocks.TURTLE_EGG with EGGS = nextInt(4) + 1 above the sand.
|
||||
let eggs = m.random.next_int_bound(4).unwrap_or(0) + 1;
|
||||
let registry = cx.w.registry;
|
||||
let state = registry
|
||||
.default_state("minecraft:turtle_egg")
|
||||
.and_then(|d| registry.state(d).cloned())
|
||||
.and_then(|mut s| {
|
||||
s.properties.insert("eggs".into(), eggs.to_string());
|
||||
registry.resolve(&s).ok()
|
||||
});
|
||||
let b = self.0.block;
|
||||
if let Some(state) = state {
|
||||
cx.events.push(MobEvent::SetBlock {
|
||||
pos: [b[0], b[1] + 1, b[2]],
|
||||
state,
|
||||
});
|
||||
}
|
||||
m.extra.flag = false;
|
||||
set_laying_egg(m, false);
|
||||
m.extra.in_love = 600;
|
||||
}
|
||||
if m.extra.flag2 {
|
||||
m.extra.counter += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// `Turtle.TurtleGoHomeGoal`: a mother with an egg heads home; any adult
|
||||
/// that strayed 64 blocks away does now and then.
|
||||
#[derive(Clone, Debug, Default)]
|
||||
struct GoHome {
|
||||
stuck: bool,
|
||||
close_to_home_try_ticks: i32,
|
||||
}
|
||||
impl Goal for GoHome {
|
||||
goal_clone!();
|
||||
fn flags(&self) -> u8 {
|
||||
0
|
||||
}
|
||||
fn name(&self) -> &'static str {
|
||||
"TurtleGoHomeGoal"
|
||||
}
|
||||
fn can_use(&mut self, m: &mut Mob, _cx: &mut Cx) -> bool {
|
||||
if m.is_baby() {
|
||||
false
|
||||
} else if has_egg(m) {
|
||||
true
|
||||
} else {
|
||||
m.random.next_int_bound(reduced(700)).unwrap_or(1) == 0 && !close_to_home(m, 64.0)
|
||||
}
|
||||
}
|
||||
fn start(&mut self, _m: &mut Mob, _cx: &mut Cx) {
|
||||
self.stuck = false;
|
||||
self.close_to_home_try_ticks = 0;
|
||||
}
|
||||
fn can_continue(&mut self, m: &mut Mob, _cx: &mut Cx) -> bool {
|
||||
!close_to_home(m, 7.0) && !self.stuck && self.close_to_home_try_ticks <= reduced(600)
|
||||
}
|
||||
fn tick(&mut self, m: &mut Mob, cx: &mut Cx) {
|
||||
let home = m.extra.home.unwrap_or(block_of(m));
|
||||
let close = close_to_home(m, 16.0);
|
||||
if close {
|
||||
self.close_to_home_try_ticks += 1;
|
||||
}
|
||||
if !m.ai.nav.is_done() {
|
||||
return;
|
||||
}
|
||||
let to = [
|
||||
f64::from(home[0]) + 0.5,
|
||||
f64::from(home[1]),
|
||||
f64::from(home[2]) + 0.5,
|
||||
];
|
||||
let mut next = m
|
||||
.default_random_pos_towards(cx.w, 16, 3, to, std::f64::consts::PI / 10.0)
|
||||
.or_else(|| m.default_random_pos_towards(cx.w, 8, 7, to, std::f64::consts::FRAC_PI_2));
|
||||
if let Some(at) = next
|
||||
&& !close
|
||||
&& cx.w.block_name(
|
||||
at[0].floor() as i32,
|
||||
at[1].floor() as i32,
|
||||
at[2].floor() as i32,
|
||||
) != "minecraft:water"
|
||||
{
|
||||
next = m.default_random_pos_towards(cx.w, 16, 5, to, std::f64::consts::FRAC_PI_2);
|
||||
}
|
||||
match next {
|
||||
Some(at) => {
|
||||
m.nav_move_to(cx.w, at, 1.0);
|
||||
}
|
||||
None => self.stuck = true,
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user