Skip to content

Minecraft: Java Edition 26.3 rewritten from scratch in Rust, checked against vanilla with 281 differential harnesses. Get it with the Horizon launcher.

Merge pull request #6465 from HrafnaValkyrja/fix/portals-entity-kinds

Ludovic Marie6ed2d97cda3d
diff --cc crates/horizon-client/src/game/persist.rs
index ac3c29d3d,78079d54e..7082adcbd
--- a/crates/horizon-client/src/game/persist.rs
+++ b/crates/horizon-client/src/game/persist.rs
@@@ -356,8 -354,9 +356,10 @@@ impl Game<'_>
self.next_entity += 1;
orb.id = self.next_entity;
let (id, p) = (orb.id, orb.position);
+ // An orb that came through a portal keeps its cooldown.
+ self.restore_portal_cooldown(id, &tag);
self.orbs.push(orb);
+ self.remember_tags(id, &tag);
let kind = "minecraft:experience_orb";
if !moved
&& !self.native_entity_joins(id, kind, [p.x, p.y, p.z], from_disk)
@@@ -391,15 -389,21 +393,23 @@@
| "minecraft:breeze_wind_charge" => {
if let Some(mut p) = entity_nbt::fireball_from_nbt(&tag, player_uuid) {
self.claim_owner(&mut p);
+ // A projectile that came through a portal keeps its cooldown.
+ self.next_entity += 1;
+ p.id = self.next_entity;
+ self.restore_portal_cooldown(p.id, &tag);
self.add_projectile(p);
+ self.remember_last_projectile_tags(&tag);
}
}
id if entity_nbt::throwable_kind(id).is_some() => {
if let Some(mut p) = entity_nbt::throwable_from_nbt(&tag, player_uuid) {
self.claim_owner(&mut p);
+ // A projectile that came through a portal keeps its cooldown.
+ self.next_entity += 1;
+ p.id = self.next_entity;
+ self.restore_portal_cooldown(p.id, &tag);
self.add_projectile(p);
+ self.remember_last_projectile_tags(&tag);
}
}
"minecraft:falling_block" => {