diff --git a/crates/horizon-client/src/game/commands.rs b/crates/horizon-client/src/game/commands.rs index c5a3fc456..4dc82867d 100644 --- a/crates/horizon-client/src/game/commands.rs +++ b/crates/horizon-client/src/game/commands.rs @@ -1783,8 +1783,12 @@ impl Game<'_> { self.level_set(pos, state) .map_err(|e| CommandError::new(Text::literal(e.to_string())))?; } + // HopperBlock.onPlace can change the state while it is being placed (a powered + // hopper arrives `enabled=false`); vanilla keeps the block entity, so compare the block. + let placed = self.world.block(pos[0], pos[1], pos[2]); + let kept = self.res.facts().get(placed).name == new; if old != new - && self.world.block(pos[0], pos[1], pos[2]) == state + && kept && let Some(entity) = horizon_client::containers::BlockEntity::for_block(&new) { self.world.block_entities.insert(key, entity); diff --git a/tools/command_exec_corpus.py b/tools/command_exec_corpus.py index b6edc009a..33976813d 100644 --- a/tools/command_exec_corpus.py +++ b/tools/command_exec_corpus.py @@ -219,6 +219,14 @@ def world_blocks(): cmd('/clone 0 205 0 4 207 4 6 205 6 masked'), cmd('/execute if blocks 0 205 0 4 207 4 6 205 6 all'), cmd('/setblock 3 206 3 minecraft:air'), + # A hopper placed into power arrives `enabled=false` and must keep its block entity. + cmd('/setblock 5 205 5 minecraft:redstone_block'), + cmd('/setblock 5 206 5 minecraft:hopper[facing=down]'), + cmd('/data get block 5 206 5 Items'), + cmd('/item replace block 5 206 5 container.0 with minecraft:diamond 3'), + cmd('/data get block 5 206 5 Items[0].count'), + cmd('/setblock 5 206 5 minecraft:air'), + cmd('/setblock 5 205 5 minecraft:air'), cmd('/fill 0 200 0 15 228 15 air'), cmd('/execute if block 0 300 0 air'), cmd('/setblock 0 400 0 stone'),