Skip to content

Handle dropped item owners, HUD snapshots and snowlogged blocks #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guhlutions wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Handle dropped item owners, HUD snapshots and snowlogged blocks #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
888756f
Handle Bedrock HUD slots, dropped item owners and snowlogging
guhlutions Nov 13, 2026
158ef4d
Keep dropped item ownership fix compatible with horse handling
guhlutions Nov 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/main/java/net/raphimc/viabedrock/api/model/container/player/HudContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,20 @@

public class HudContainer extends InventoryRedirectContainer {

private static final int LEGACY_SIZE = 54;

public HudContainer(final UserConnection user) {
super(user, (byte) ContainerID.CONTAINER_ID_PLAYER_ONLY_UI.getValue(), ContainerType.HUD, 54);
super(user, (byte) ContainerID.CONTAINER_ID_PLAYER_ONLY_UI.getValue(), ContainerType.HUD, 57);
}

@Override
public boolean setItems(final BedrockItem[] items) {
if (items.length == LEGACY_SIZE) {
final BedrockItem[] expanded = BedrockItem.emptyArray(this.size());
System.arraycopy(items, 0, expanded, 0, items.length);
return super.setItems(expanded);
}
return super.setItems(items);
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/net/raphimc/viabedrock/protocol/rewriter/EntityMetadataRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,9 @@ public static boolean rewrite(final UserConnection user, final Entity entity, fi
if (ownerId == -1) {
break; // No owner
}
if (entity.javaType().is(EntityTypes26_3.ITEM)) {
break; // The Bedrock server enforces who can pick up a dropped item.
}
final Entity ownerEntity = entityTracker.getEntityByUid(ownerId);
if (ownerEntity == null) {
ViaBedrock.getPlatform().getLogger().log(Level.WARNING, "Failed to find owner entity with id " + ownerId + " for entity " + entity.type());
Expand Down
47 changes: 26 additions & 21 deletions src/main/java/net/raphimc/viabedrock/protocol/storage/ChunkTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import net.raphimc.viabedrock.api.chunk.section.BedrockChunkSection;
import net.raphimc.viabedrock.api.chunk.section.BedrockChunkSectionImpl;
import net.raphimc.viabedrock.api.model.BedrockBlockState;
import net.raphimc.viabedrock.api.model.BlockState;
import net.raphimc.viabedrock.protocol.BedrockProtocol;
import net.raphimc.viabedrock.protocol.ServerboundBedrockPackets;
import net.raphimc.viabedrock.protocol.data.ProtocolConstants;
Expand Down Expand Up @@ -217,25 +218,34 @@ public int getJavaBlockState(final BedrockChunkSection section, final int sectio
remappedBlockState = ProtocolConstants.JAVA_AIR_ID;
}

if (blockState0 != this.bedrockAirId() && blockPalettes.size() > 1) {
final int airId = this.bedrockAirId();
if (blockState0 != airId && blockPalettes.size() > 1) {
final int blockState1 = blockPalettes.get(1).idAt(sectionX, sectionY, sectionZ);
if (blockState1 != this.bedrockAirId()) {
if (CustomBlockTags.WATER.equals(blockStateRewriter.tag(blockState1))) { // Waterlogging
final int waterloggedBlockState = blockStateRewriter.waterlog(remappedBlockState);
if (waterloggedBlockState != -1) {
remappedBlockState = waterloggedBlockState;
} else {
ViaBedrock.getPlatform().getLogger().log(Level.WARNING, "Missing waterlogged block state: " + blockState0);
}
} else {
ViaBedrock.getPlatform().getLogger().log(Level.WARNING, "Invalid layer 2 block state. L1: " + blockState0 + ", L2: " + blockState1);
}
if (blockState1 != airId) {
return this.remapSecondBlockLayer(blockStateRewriter, blockState0, blockState1, remappedBlockState);
}
}

return remappedBlockState;
}

private int remapSecondBlockLayer(final BlockStateRewriter blockStateRewriter, final int blockState0, final int blockState1, final int javaBlockState) {
if (CustomBlockTags.WATER.equals(blockStateRewriter.tag(blockState1))) {
final int waterloggedBlockState = blockStateRewriter.waterlog(javaBlockState);
if (waterloggedBlockState != -1) {
return waterloggedBlockState;
}
ViaBedrock.getPlatform().getLogger().log(Level.WARNING, "Missing waterlogged block state: " + blockState0);
} else {
final BlockState primaryState = blockStateRewriter.blockState(blockState0);
// Snowlogged blocks are stored under snow in Bedrock. Keep the snow depth in Java's single block state.
if (primaryState == null || !primaryState.namespacedIdentifier().equals("minecraft:snow_layer") || blockStateRewriter.blockState(blockState1) == null) {
ViaBedrock.getPlatform().getLogger().log(Level.WARNING, "Invalid layer 2 block state. L1: " + blockState0 + ", L2: " + blockState1);
}
}
return javaBlockState;
}

public BedrockBlockEntity getBlockEntity(final BlockPosition blockPosition) {
final BedrockChunk chunk = this.getChunk(blockPosition.x() >> 4, blockPosition.z() >> 4);
if (chunk == null) {
Expand Down Expand Up @@ -585,15 +595,10 @@ private Chunk remapChunk(final BedrockChunk chunk) {
continue;
}

if (CustomBlockTags.WATER.equals(blockStateRewriter.tag(blockState1))) { // Waterlogging
final int waterloggedBlockState = blockStateRewriter.waterlog(remappedBlockPalette.idAt(x, y, z));
if (waterloggedBlockState != -1) {
remappedBlockPalette.setIdAt(x, y, z, waterloggedBlockState);
} else {
ViaBedrock.getPlatform().getLogger().log(Level.WARNING, "Missing waterlogged block state: " + blockState0);
}
} else {
ViaBedrock.getPlatform().getLogger().log(Level.WARNING, "Invalid layer 2 block state. L1: " + blockState0 + ", L2: " + blockState1);
final int javaBlockState = remappedBlockPalette.idAt(x, y, z);
final int combinedBlockState = this.remapSecondBlockLayer(blockStateRewriter, blockState0, blockState1, javaBlockState);
if (combinedBlockState != javaBlockState) {
remappedBlockPalette.setIdAt(x, y, z, combinedBlockState);
}
}
}
Expand Down