A mob a guest kills is the guest's kill
LivingEntity.die credits the kill to lastHurtByPlayer: the killed statistic, the mob_kills custom statistic, the kill score criteria and the player_killed_entity trigger belong to that player. Horizon kept only whether a player had hurt the mob, and the death ran as the host, so a LAN or server guest's kills counted in the host's statistics and advancements. The mobs a player hurt now remember which player (the acting guest's connection, or the host), and the killer's side of the death runs as that guest. lan_e2e `kills`: a pig the guest kills shows in the guest's minecraft.killed:minecraft.pig score, not the host's. Part of #484 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1236,7 +1236,9 @@ struct Game<'a> {
|
||||
/// swap just before an attack keeps them, with the new item's enchantments
|
||||
/// (attribute swapping).
|
||||
attack_item: Option<Arc<str>>,
|
||||
last_hurt_by_player: HashSet<u32>,
|
||||
/// Mobs a player hurt (`LivingEntity.lastHurtByPlayer`), with the guest
|
||||
/// it was by connection (None: the host).
|
||||
last_hurt_by_player: HashMap<u32, Option<u32>>,
|
||||
/// Mobs whose death (`LivingEntity.die`) has been handled.
|
||||
died: HashSet<u32>,
|
||||
/// Client-ticked block-entity animation state (`game/block_entity_anims.rs`).
|
||||
@@ -6937,7 +6939,8 @@ impl Game<'_> {
|
||||
(actual * 0.5) as u32,
|
||||
);
|
||||
}
|
||||
self.last_hurt_by_player.insert(self.mobs[index].id);
|
||||
self.last_hurt_by_player
|
||||
.insert(self.mobs[index].id, self.lan_acting);
|
||||
let sound = if crit {
|
||||
"minecraft:entity.player.attack.crit"
|
||||
} else if scale > 0.9 {
|
||||
@@ -11323,7 +11326,7 @@ impl<'a> Game<'a> {
|
||||
raiding: Default::default(),
|
||||
attack_ticks: 100,
|
||||
attack_item: None,
|
||||
last_hurt_by_player: HashSet::new(),
|
||||
last_hurt_by_player: HashMap::new(),
|
||||
died: HashSet::new(),
|
||||
be_anims: {
|
||||
let mut anims = horizon_client::block_entity_anim::BlockEntityAnims::default();
|
||||
|
||||
@@ -622,7 +622,8 @@ impl Game<'_> {
|
||||
}
|
||||
/// LivingEntity.die / dropAllDeathLoot.
|
||||
fn mob_died(&mut self, m: &Mob) {
|
||||
let by_player = self.last_hurt_by_player.remove(&m.id) || m.ai.last_hurt_by_player > 0;
|
||||
let killer = self.last_hurt_by_player.remove(&m.id);
|
||||
let by_player = killer.is_some() || m.ai.last_hurt_by_player > 0;
|
||||
let mut dying = m.clone();
|
||||
// LivingEntity.die: the death is heard, and a sculk catalyst nearby
|
||||
// takes the experience (before the loot is dropped).
|
||||
@@ -636,11 +637,22 @@ impl Game<'_> {
|
||||
}
|
||||
});
|
||||
if by_player {
|
||||
self.stats.add("killed", &m.kind.id, 1);
|
||||
self.stats.custom("mob_kills", 1);
|
||||
self.score_player_killed(super::commands::Target::Mob(m.id));
|
||||
let view = self.mob_entity(m);
|
||||
self.trigger_entity("minecraft:player_killed_entity", "entity", &view);
|
||||
// A guest's kill is theirs: their statistics, scores and
|
||||
// advancements (LivingEntity.die credits lastHurtByPlayer).
|
||||
let guest = killer.flatten().filter(|_| self.lan_acting.is_none());
|
||||
let credited = guest.is_some_and(|conn| {
|
||||
let Some(mut host) = self.lan.take() else {
|
||||
return false;
|
||||
};
|
||||
let done = self
|
||||
.as_guest(&mut host, conn, |g| g.credit_kill(m))
|
||||
.is_some();
|
||||
self.lan = Some(host);
|
||||
done
|
||||
});
|
||||
if !credited {
|
||||
self.credit_kill(m);
|
||||
}
|
||||
}
|
||||
self.score_entity_removed(m.id);
|
||||
self.raider_died(m, by_player);
|
||||
@@ -675,6 +687,15 @@ impl Game<'_> {
|
||||
}
|
||||
}
|
||||
}
|
||||
/// The killer's side of a mob's death: `ServerPlayer.awardKillScore`'s
|
||||
/// statistics and scores, and the `player_killed_entity` trigger.
|
||||
fn credit_kill(&mut self, m: &Mob) {
|
||||
self.stats.add("killed", &m.kind.id, 1);
|
||||
self.stats.custom("mob_kills", 1);
|
||||
self.score_player_killed(super::commands::Target::Mob(m.id));
|
||||
let view = self.mob_entity(m);
|
||||
self.trigger_entity("minecraft:player_killed_entity", "entity", &view);
|
||||
}
|
||||
/// `dropAllDeathLoot` through `mobs::drops`: the entity loot table from the
|
||||
/// world's random sequence, equipment by drop chance, species extras and
|
||||
/// the experience orbs, spawned in order.
|
||||
@@ -1973,7 +1994,7 @@ impl Game<'_> {
|
||||
.find(|m| m.id == id)
|
||||
.is_some_and(|m| m.damage(amount, source));
|
||||
if p.owner == Some(Who::Player) {
|
||||
self.last_hurt_by_player.insert(id);
|
||||
self.last_hurt_by_player.insert(id, self.lan_acting);
|
||||
}
|
||||
hurt
|
||||
}
|
||||
|
||||
@@ -665,7 +665,7 @@ impl Game<'_> {
|
||||
if let Some(m) = self.mobs.iter_mut().find(|m| m.id == id) {
|
||||
m.damage(amount, horizon_client::mobs::Damage::player(at));
|
||||
}
|
||||
self.last_hurt_by_player.insert(id);
|
||||
self.last_hurt_by_player.insert(id, self.lan_acting);
|
||||
}
|
||||
"set" => {
|
||||
let n = |i: usize| words[i].parse::<i32>().unwrap_or(0);
|
||||
|
||||
@@ -131,7 +131,7 @@ impl Game<'_> {
|
||||
m.damage(1.0, source);
|
||||
}
|
||||
if p.owner == Some(Who::Player) {
|
||||
self.last_hurt_by_player.insert(id);
|
||||
self.last_hurt_by_player.insert(id, self.lan_acting);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+33
-2
@@ -20,6 +20,7 @@ address. The script then checks, from both sides, what a guest's game used to ge
|
||||
drowning and the void (then respawns);
|
||||
- pvp: the guest and the host hit each other with a sword; with the pvp game rule off, or on one
|
||||
team without friendly fire, nothing;
|
||||
- kills: a pig the guest kills counts in the guest's killed statistic, not the host's (#484);
|
||||
- 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;
|
||||
@@ -111,7 +112,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', 'hurt', 'respawn', 'containers', 'feedback', 'titles', 'chat', 'commands', 'recipes', 'machines', 'brewing', 'trials', 'clicks', 'sleep', 'push', 'eat', 'eating', 'xp', 'objects', 'projectiles', 'light', 'time', 'swings', 'cracks', 'plates', 'effects', 'portals', 'distance', 'growth']
|
||||
CHECKS = ['tab', 'self', 'armour', 'nametags', 'walls', 'chest', 'crafting', 'sign', 'damage', 'mobs', 'hazards', 'pvp', 'kills', 'hurt', 'respawn', 'containers', 'feedback', 'titles', 'chat', 'commands', 'recipes', 'machines', 'brewing', 'trials', 'clicks', 'sleep', 'push', 'eat', 'eating', 'xp', 'objects', 'projectiles', 'light', 'time', 'swings', 'cracks', 'plates', 'effects', 'portals', 'distance', 'growth']
|
||||
|
||||
|
||||
class Game:
|
||||
@@ -613,6 +614,36 @@ def check_pvp(host, guest, out):
|
||||
return hits
|
||||
|
||||
|
||||
def check_kills(host, guest, out):
|
||||
# A mob the guest kills is the guest's kill (#484): LivingEntity.die credits lastHurtByPlayer, so the
|
||||
# killed statistic (and its scoreboard criterion) counts for the guest, not the host.
|
||||
host('command', command='scoreboard objectives add parity_kills minecraft.killed:minecraft.pig')
|
||||
for g in (host, guest):
|
||||
g('command', command='gamemode survival')
|
||||
guest('command', command='item replace entity @s weapon.mainhand with minecraft:iron_sword')
|
||||
face_each_other(host, guest)
|
||||
hx, hy, hz = pos_of(host)
|
||||
try:
|
||||
# Between the two, in front of the guest, with one health left.
|
||||
host('command', command=f'summon minecraft:pig {hx + 1.5:.2f} {hy:.2f} {hz:.2f} {{NoAI:1b,Health:1.0f}}')
|
||||
guest.wait(30)
|
||||
guest.raw('look-at', f'{hx + 1.5:.2f}', f'{hy + 0.5:.2f}', f'{hz:.2f}')
|
||||
guest.wait(10)
|
||||
guest.raw('attack')
|
||||
guest.wait(20)
|
||||
host('command', command=f'scoreboard players get {GUEST_NAME} parity_kills')
|
||||
host('command', command=f'scoreboard players get {host.player} parity_kills')
|
||||
host.wait(10)
|
||||
chat = host.raw('messages', 10)['chat']
|
||||
guest.shot(out, 'kills')
|
||||
finally:
|
||||
host('command', command='kill @e[type=minecraft:pig]')
|
||||
host('command', command='scoreboard objectives remove parity_kills')
|
||||
assert any(f'{GUEST_NAME} has 1 [parity_kills]' in line for line in chat), f"the guest's kill is not theirs: {chat}"
|
||||
assert not any(f'{host.player} has 1 [parity_kills]' in line for line in chat), f"the host got the guest's kill: {chat}"
|
||||
return chat
|
||||
|
||||
|
||||
def dead_players(game, want, ticks=60):
|
||||
"""The other players `game`'s client draws dead, once that is `want` (empty or not) or after `ticks`."""
|
||||
for _ in range(ticks // 5):
|
||||
@@ -1712,7 +1743,7 @@ CHECK_FNS = {'tab': check_tab, 'self': check_self, 'armour': check_armour, 'name
|
||||
'xp': check_xp, 'objects': check_objects, 'projectiles': check_projectiles,
|
||||
'light': check_light, 'plates': check_plates,
|
||||
'swings': check_swings, 'cracks': check_cracks,
|
||||
'time': check_time, 'growth': check_growth}
|
||||
'time': check_time, 'growth': check_growth, 'kills': check_kills}
|
||||
|
||||
|
||||
def run(ctl, out, resources, checks):
|
||||
|
||||
Reference in New Issue
Block a user