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 main into fix/firework-selectors

k3yh3740468b53a9
diff --cc crates/horizon-client/src/game/commands/data.rs
index 5a0d5ff3e,e012f7eab..27517b545
--- a/crates/horizon-client/src/game/commands/data.rs
+++ b/crates/horizon-client/src/game/commands/data.rs
@@@ -212,21 -212,6 +212,11 @@@ impl Game<'_>
);
crate::game::persist::with_raw(tag, raw)
}
+ Target::Rocket(id) => {
+ let uuid = self.uuid_for(id);
+ let r = self.rockets.iter().find(|r| r.id == id)?;
- let owner = if r.owner == Some(horizon_client::mobs::Who::Player) {
- player_uuid
- } else {
- None
- };
- entity_nbt::firework_rocket_to_nbt(
- &r.saved_fields(),
- uuid,
- owner,
- self.persist.raw.get(&id),
- )
++ r.to_nbt(uuid, player_uuid, self.persist.raw.get(&id))
+ }
Target::Spawner(id) => {
let s = self.ominous_spawners.iter().find(|s| s.id == id)?;
let [x, y, z] = s.position;
diff --cc crates/horizon-client/src/game/persist.rs
index b29b41115,7082adcbd..4e65cac10
--- a/crates/horizon-client/src/game/persist.rs
+++ b/crates/horizon-client/src/game/persist.rs
@@@ -1168,14 -1173,14 +1178,13 @@@ impl Game<'_>
out.entry(chunk_of(f.position)).or_default().push(tag);
}
}
-- for r in &self.rockets {
-- if keys.contains(&chunk_of(r.position)) {
-- let (uuid, raw) = anon(&self.persist, "minecraft:firework_rocket", r.position);
-- out.entry(chunk_of(r.position)).or_default().push(r.to_nbt(
-- uuid,
-- self.level.player_uuid,
-- raw.as_ref(),
-- ));
++ for i in 0..self.rockets.len() {
++ if keys.contains(&chunk_of(self.rockets[i].position)) {
++ let (id, at) = (self.rockets[i].id, self.rockets[i].position);
++ let uuid = self.uuid_for(id);
++ let tag =
++ self.rockets[i].to_nbt(uuid, self.level.player_uuid, self.persist.raw.get(&id));
++ out.entry(chunk_of(at)).or_default().push(tag);
}
}
for t in &self.tridents {