Merge remote-tracking branch 'origin/fix/lan-damage-events' into integ/bl4
# Conflicts: # crates/horizon-protocol/src/packets/play.rs # tools/lan_e2e.py
This commit is contained in:
@@ -579,7 +579,7 @@ impl Game<'_> {
|
||||
push(
|
||||
[m.position.x, m.position.y, m.position.z],
|
||||
m.kind.id.as_ref(),
|
||||
json!({ "id": m.id, "kind": "mob", "health": m.health, "baby": m.is_baby() }),
|
||||
json!({ "id": m.id, "kind": "mob", "health": m.health, "baby": m.is_baby(), "hurt_time": m.hurt_time }),
|
||||
);
|
||||
}
|
||||
for item in &self.dropped {
|
||||
|
||||
@@ -3016,7 +3016,7 @@ impl Game<'_> {
|
||||
}
|
||||
/// Mob.getBaseExperienceReward
|
||||
/// The damage type id of a Horizon damage kind.
|
||||
fn damage_type(kind: horizon_client::mobs::DamageKind, player: bool) -> &'static str {
|
||||
pub(super) fn damage_type(kind: horizon_client::mobs::DamageKind, player: bool) -> &'static str {
|
||||
use horizon_client::mobs::DamageKind as K;
|
||||
match kind {
|
||||
K::PlayerAttack => "minecraft:player_attack",
|
||||
|
||||
@@ -1086,8 +1086,30 @@ impl Game<'_> {
|
||||
.and_then(|s| s.get(&m.id))
|
||||
.copied();
|
||||
let at = [m.position.x, m.position.y, m.position.z];
|
||||
if m.hurt_time > old.map_or(0, |o| o.0) && !dead {
|
||||
host.hub.entity_event(m.id as i32, 2, at);
|
||||
// LivingEntity.hurtServer: a hurt that restarted the hurt time.
|
||||
if m.hurt_time > old.map_or(0, |o| o.0)
|
||||
&& !dead
|
||||
&& let Some((source, _)) = m.last_damage
|
||||
{
|
||||
use horizon_client::mobs::{DamageKind as K, Who};
|
||||
let player = source.attacker == Some(Who::Player);
|
||||
let kind = super::creatures::damage_type(source.kind, player);
|
||||
// The player a mob sees is the guest acting, else the host.
|
||||
let cause = source.attacker.map(|who| match who {
|
||||
Who::Player => host
|
||||
.mob_players
|
||||
.get(&m.id)
|
||||
.and_then(|conn| host.hub.guest(*conn))
|
||||
.map_or(host.host_entity, |g| g.entity_id),
|
||||
Who::Mob(id) => id as i32,
|
||||
});
|
||||
// A projectile is the direct entity of its hit: not tracked here.
|
||||
let melee = matches!(
|
||||
source.kind,
|
||||
K::PlayerAttack | K::MaceSmash | K::MobAttack | K::Sting | K::SonicBoom
|
||||
);
|
||||
let direct = cause.filter(|_| melee);
|
||||
host.hub.damage_event(m.id as i32, kind, cause, direct, at);
|
||||
}
|
||||
if dead && !old.is_some_and(|o| o.1) {
|
||||
host.hub.entity_event(m.id as i32, 3, at);
|
||||
|
||||
@@ -1606,6 +1606,15 @@ impl Game<'_> {
|
||||
pl.velocity = Vec3::new(p.velocity[0], p.velocity[1], p.velocity[2]);
|
||||
}
|
||||
}
|
||||
// ClientPacketListener.handleDamageEvent: LivingEntity.handleDamageEvent
|
||||
// jolts the walk animation and restarts the hurt flash. Its hurt
|
||||
// sound comes as a sound from Horizon's host, which plays it itself.
|
||||
C::DamageEvent(p) => {
|
||||
if let Some(m) = self.mobs.iter_mut().find(|m| m.id == p.id as u32) {
|
||||
m.limb_speed = 1.5;
|
||||
m.hurt_time = 10;
|
||||
}
|
||||
}
|
||||
C::HurtAnimation(p) => {
|
||||
if let Some(m) = self.mobs.iter_mut().find(|m| m.id == p.id as u32) {
|
||||
m.hurt_time = 10;
|
||||
|
||||
@@ -109,6 +109,33 @@ impl Hub {
|
||||
);
|
||||
}
|
||||
|
||||
/// `ServerLevel.broadcastDamageEvent`: the clients around show the hurt
|
||||
/// entity's flash and hear its hurt sound.
|
||||
pub fn damage_event(
|
||||
&self,
|
||||
id: i32,
|
||||
kind: &str,
|
||||
cause: Option<i32>,
|
||||
direct: Option<i32>,
|
||||
at: [f64; 3],
|
||||
) {
|
||||
let Some(source_type) = self.sync.id("minecraft:damage_type", kind) else {
|
||||
return;
|
||||
};
|
||||
self.broadcast_near(
|
||||
at,
|
||||
128.0,
|
||||
&C::DamageEvent(play::DamageEvent {
|
||||
id,
|
||||
source_type,
|
||||
cause,
|
||||
direct,
|
||||
position: None,
|
||||
}),
|
||||
None,
|
||||
);
|
||||
}
|
||||
|
||||
pub fn swing(&self, id: i32, hand: i32, at: [f64; 3], except: Option<u32>) {
|
||||
self.broadcast_near(
|
||||
at,
|
||||
|
||||
@@ -244,6 +244,18 @@ packet!(EntityPositionSync { id: i32 => VarInt, path: PositionPath => PositionPa
|
||||
packet!(ForgetLevelChunk { pos: [i32; 2] => ChunkPos });
|
||||
packet!(GameEvent { event: u8 => UByte, param: f32 => Float });
|
||||
packet!(HurtAnimation { id: i32 => VarInt, yaw: f32 => Float });
|
||||
packet!(
|
||||
/// ClientboundDamageEventPacket: the hurt entity, the damage type's
|
||||
/// registry id, the causing and the direct entity (none: -1 on the wire's
|
||||
/// id + 1) and the source's position.
|
||||
DamageEvent {
|
||||
id: i32 => VarInt,
|
||||
source_type: i32 => VarInt,
|
||||
cause: Option<i32> => OptVarInt,
|
||||
direct: Option<i32> => OptVarInt,
|
||||
position: Option<[f64; 3]> => Opt<Vec3d>,
|
||||
}
|
||||
);
|
||||
packet!(LevelChunkWithLight { x: i32 => Int, z: i32 => Int, chunk: ChunkData => ChunkData, light: LightData => LightData });
|
||||
packet!(LevelEvent { kind: i32 => Int, pos: [i32; 3] => Pos, data: i32 => Int, global: bool => Bool });
|
||||
packet!(LightUpdate { x: i32 => VarInt, z: i32 => VarInt, light: LightData => LightData });
|
||||
@@ -1406,6 +1418,7 @@ packet_enum!(Clientbound, crate::ids::play::clientbound {
|
||||
GameEvent(GameEvent) = GAME_EVENT,
|
||||
GameRuleValues(GameRuleValues) = GAME_RULE_VALUES,
|
||||
HurtAnimation(HurtAnimation) = HURT_ANIMATION,
|
||||
DamageEvent(DamageEvent) = DAMAGE_EVENT,
|
||||
KeepAlive(KeepAlive) = KEEP_ALIVE,
|
||||
InitializeBorder(InitializeBorder) = INITIALIZE_BORDER,
|
||||
LevelChunkWithLight(LevelChunkWithLight) = LEVEL_CHUNK_WITH_LIGHT,
|
||||
@@ -2141,6 +2154,13 @@ mod tests {
|
||||
}],
|
||||
}],
|
||||
}),
|
||||
Clientbound::DamageEvent(DamageEvent {
|
||||
id: 7,
|
||||
source_type: 31,
|
||||
cause: Some(0),
|
||||
direct: None,
|
||||
position: Some([1.5, -2.0, 3.25]),
|
||||
}),
|
||||
Clientbound::SetHealth(SetHealth {
|
||||
health: 17.5,
|
||||
food: 18,
|
||||
|
||||
+39
-3
@@ -22,6 +22,8 @@ address. The script then checks, from both sides, what a guest's game used to ge
|
||||
- respawn: a player killed is drawn dead by the other side, and alive again once it respawns (the
|
||||
respawned player is a new entity to the others); the host dies, and on the server thread
|
||||
the guest too;
|
||||
- hurt: a pig the guest hits, and one the host hits, flashes red on the other side too (the
|
||||
server's damage event) (#848);
|
||||
- containers: the guest's ender chest holds the guest's items, not the host's, and a double chest
|
||||
opens as 9x6 with the right half first;
|
||||
- machines: a hopper, a dispenser and a dropper open on the guest's screen with their 5 and 9
|
||||
@@ -96,7 +98,7 @@ ROOT = Path(__file__).resolve().parents[1]
|
||||
GUEST_NAME = 'Guest'
|
||||
# The host plays single player on its server thread (--server-thread).
|
||||
SERVER_THREAD = False
|
||||
CHECKS = ['tab', 'self', 'armour', 'nametags', 'walls', 'chest', 'crafting', 'sign', 'damage', 'mobs', 'hazards', 'pvp', 'respawn', 'containers', 'feedback', 'titles', 'chat', 'commands', 'recipes', 'machines', 'brewing', 'trials', 'clicks', 'sleep', 'push', 'eat', 'xp', 'objects', 'projectiles', 'light', 'plates', 'effects', 'portals', 'distance']
|
||||
CHECKS = ['tab', 'self', 'armour', 'nametags', 'walls', 'chest', 'crafting', 'sign', 'damage', 'mobs', 'hazards', 'pvp', 'hurt', 'respawn', 'containers', 'feedback', 'titles', 'chat', 'commands', 'recipes', 'machines', 'brewing', 'trials', 'clicks', 'sleep', 'push', 'eat', 'xp', 'objects', 'projectiles', 'light', 'plates', 'effects', 'portals', 'distance']
|
||||
|
||||
|
||||
class Game:
|
||||
@@ -626,6 +628,33 @@ def check_respawn(host, guest, out):
|
||||
return results
|
||||
|
||||
|
||||
def check_hurt(host, guest, out):
|
||||
for g in (host, guest):
|
||||
g('command', command='gamemode survival')
|
||||
g('command', command='clear @s')
|
||||
face_each_other(host, guest)
|
||||
hx, hy, hz = pos_of(host)
|
||||
# Between the two, within both players' reach; bare hands leave it alive.
|
||||
host('command', command=f'summon minecraft:pig {hx + 1.5:.2f} {hy:.2f} {hz + 0.8:.2f} {{NoAI:1b}}')
|
||||
host.wait(30)
|
||||
|
||||
def pig(game):
|
||||
return game.raw('entities', 6, 'pig')['entities'][0]
|
||||
seen = {}
|
||||
for name, attacker, watcher in (('guest hits', guest, host), ('host hits', host, guest)):
|
||||
attacker.wait(30) # a full attack charge
|
||||
attacker.raw('attack', pig(attacker)['id'])
|
||||
seen[name] = {'attacker': pig(attacker)['hurt_time'], 'watcher': pig(watcher)['hurt_time']}
|
||||
attacker.shot(out, 'hurt-' + name.replace(' ', '-'))
|
||||
watcher.shot(out, 'hurt-' + name.replace(' ', '-') + '-seen')
|
||||
attacker.wait(20)
|
||||
host('command', command='kill @e[type=minecraft:pig]')
|
||||
# LivingEntity.hurtTime: 10 when hurt, one less each tick; the reads come a few ticks later.
|
||||
for name, sides in seen.items():
|
||||
assert all(t > 0 for t in sides.values()), f'{name}: the pig\'s hurt flash {seen}'
|
||||
return seen
|
||||
|
||||
|
||||
def container_items(game):
|
||||
"""The open container's stacks by slot (Horizon's container slots are 300 and up) and its size."""
|
||||
slots = [s for s in game('screen').get('slots', []) if s.get('slot', 0) >= 300]
|
||||
@@ -1246,7 +1275,13 @@ def check_xp(host, guest, out):
|
||||
g('command', command='gamemode survival')
|
||||
g('command', command='xp set @s 0 levels')
|
||||
g('command', command='xp set @s 0 points')
|
||||
# Out of the orbs' way wherever an earlier check left the host (ExperienceOrb follows the
|
||||
# nearest player who isn't a spectator).
|
||||
host('command', command='gamemode spectator')
|
||||
guest.wait(10)
|
||||
# `xp set` leaves Player.totalExperience (the score): experience from earlier checks stays in it.
|
||||
total = guest('state')['player']['xp']['total']
|
||||
host_total = host('state')['player']['xp']['total']
|
||||
x, y, z = pos_of(guest)
|
||||
# Three orbs of 7 points 4 blocks east of the guest (out of reach, within the 8 blocks orbs
|
||||
# follow from): they fly to the guest.
|
||||
@@ -1262,8 +1297,8 @@ def check_xp(host, guest, out):
|
||||
detail = {'seen': seen, 'guest': xp, 'host': host_xp, 'left': left}
|
||||
# ExperienceOrb.scanForMerges: orbs of one value side by side can merge into one.
|
||||
assert 1 <= seen <= 3, f'the guest saw {seen} orbs: {detail}'
|
||||
assert xp['total'] == 21 and xp['level'] == 2, f'the guest\'s experience after three 7-point orbs: {detail}'
|
||||
assert host_xp['total'] == 0, f'the host took the orbs: {detail}'
|
||||
assert xp['total'] - total == 21 and xp['level'] == 2, f'the guest\'s experience after three 7-point orbs: {detail}'
|
||||
assert host_xp['total'] == host_total, f'the host took the orbs: {detail}'
|
||||
assert left == 0, f'orbs left on the guest\'s screen: {detail}'
|
||||
return {'seen': seen, 'guest': xp, 'host': host_xp}
|
||||
|
||||
@@ -1422,6 +1457,7 @@ CHECK_FNS = {'tab': check_tab, 'self': check_self, 'armour': check_armour, 'name
|
||||
'containers': check_containers, 'feedback': check_feedback, 'titles': check_titles, 'chat': check_chat,
|
||||
'machines': check_machines,
|
||||
'brewing': check_brewing,
|
||||
'hurt': check_hurt,
|
||||
'commands': check_commands,
|
||||
'recipes': check_recipes, 'trials': check_trials, 'walls': check_walls,
|
||||
'effects': check_effects, 'portals': check_portals, 'distance': check_distance, 'clicks': check_clicks,
|
||||
|
||||
Reference in New Issue
Block a user