GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-06 15:41:50 +00:00
Code Issues Releases Activity

Fix: Use real barrels whenever possible instead of fak chest workaround

Browse Source 
Fixes https://github.com/GeyserMC/Geyser/issues/5292, fixes https://github.com/GeyserMC/Geyser/issues/5294
This commit is contained in:
onebeastchris
2025-02-06 18:40:32 +01:00
parent 0416b55959
commit b96f9157e9
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/geysermc/geyser/translator/inventory/chest/SingleChestInventoryTranslator.java
View File

@@ -38,15 +38,14 @@ import org.geysermc.geyser.session.GeyserSession;
public class SingleChestInventoryTranslator extends ChestInventoryTranslator {
private final InventoryHolder holder;
// TODO add barrel???
public SingleChestInventoryTranslator(int size) {
super(size, 27);
this.holder = new BlockInventoryHolder(Blocks.CHEST.defaultBlockState().withValue(Properties.CHEST_TYPE, ChestType.SINGLE), ContainerType.CONTAINER,
Blocks.ENDER_CHEST, Blocks.TRAPPED_CHEST) {
Blocks.ENDER_CHEST, Blocks.TRAPPED_CHEST, Blocks.BARREL) {
@Override
protected boolean isValidBlock(BlockState blockState) {
if (blockState.is(Blocks.ENDER_CHEST)) {
// Can't have double ender chests
if (blockState.is(Blocks.ENDER_CHEST) || blockState.is(Blocks.BARREL)) {
// Can't have double ender chests or barrels
return true;
}

12
core/src/main/java/org/geysermc/geyser/util/InventoryUtils.java
View File

@@ -45,6 +45,7 @@ import org.geysermc.geyser.inventory.recipe.GeyserShapedRecipe;
import org.geysermc.geyser.inventory.recipe.GeyserShapelessRecipe;
import org.geysermc.geyser.item.Items;
import org.geysermc.geyser.level.BedrockDimension;
import org.geysermc.geyser.level.block.type.BlockState;
import org.geysermc.geyser.registry.Registries;
import org.geysermc.geyser.registry.type.ItemMappings;
import org.geysermc.geyser.session.GeyserSession;
@@ -173,15 +174,22 @@ public class InventoryUtils {
if (position.getY() < minY) {
return null;
}
if (position.getY() >= maxY) {
if (position.getY() >= maxY || !canUseWorldSpace(session, position)) {
position = flatPlayerPosition.sub(0, 4, 0);
if (position.getY() >= maxY) {
if (position.getY() >= maxY || !canUseWorldSpace(session, position)) {
return null;
}
}
return position;
}
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
private static boolean canUseWorldSpace(GeyserSession session, Vector3i position) {
BlockState state = session.getGeyser().getWorldManager().blockAt(session, position);
// Block entities require more data to be restored; so let's avoid using these positions
return state.block().blockEntityType() == null;
}
public static void updateCursor(GeyserSession session) {
InventorySlotPacket cursorPacket = new InventorySlotPacket();
cursorPacket.setContainerId(ContainerId.UI);