Merge pull request #2338 from kacpherek/fix/enderman-angry-speed
🤖 Agent: Merged by Ludovic's AI agent (Claude, contrib-gate-19) after the contribution gate. Checked against vanilla 26.3 and proven in union/cg19-r2 (all round-2 PRs together: clippy, 1722 tests, 135 harnesses, lan_e2e in-frame and on the server thread) and union/cg19-r3 (the same PRs merged with today's main: 96/96 harnesses). Thanks @kacpherek.
This commit is contained in:
@@ -2134,8 +2134,10 @@ impl Mob {
|
||||
/// Movement speed attribute bonus (baby zombies, sprinting modifiers).
|
||||
/// MOVEMENT_SPEED including effects (speed +20%/level, slowness -15%/level).
|
||||
pub fn movement_speed(&self) -> f64 {
|
||||
let mut v = strider::movement_speed(self, witch::speed(self, self.attrs.speed))
|
||||
* self.speed_bonus();
|
||||
let mut v = strider::movement_speed(
|
||||
self,
|
||||
witch::speed(self, self.attrs.speed) + enderman::attacking_speed(self),
|
||||
) * self.speed_bonus();
|
||||
for (e, _, amp) in &self.extra.effects {
|
||||
match *e {
|
||||
"minecraft:speed" => v *= 1.0 + 0.2 * f64::from(amp + 1),
|
||||
|
||||
@@ -154,6 +154,15 @@ fn teleport_towards(
|
||||
let z = m.position.z + (m.random.next_double() - 0.5) * 8.0 - d[2] * 16.0;
|
||||
teleport_to(m, w, x, y, z, events)
|
||||
}
|
||||
/// `Enderman.SPEED_MODIFIER_ATTACKING`, an ADD_VALUE modifier `setTarget`
|
||||
/// adds while the enderman has a target.
|
||||
pub fn attacking_speed(m: &Mob) -> f64 {
|
||||
if m.species() == Species::Enderman && m.ai.target.is_some() {
|
||||
f64::from(0.15f32)
|
||||
} else {
|
||||
0.0
|
||||
}
|
||||
}
|
||||
/// Enderman.customServerAiStep: in daylight, flee by teleporting. The End has a
|
||||
/// fixed time, so `Level.isBrightOutside` is never true there.
|
||||
pub fn custom_server_ai_step(m: &mut Mob, cx: &mut Cx) {
|
||||
|
||||
Reference in New Issue
Block a user