Sanity check for shulker boxes (#4762)

GeyserMC · Jun 17, 2024 · 29928c2 · 29928c2
1 parent deb25d7
commit 29928c2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/core/src/main/java/org/geysermc/geyser/level/block/type/BlockState.java b/core/src/main/java/org/geysermc/geyser/level/block/type/BlockState.java
@@ -73,6 +73,15 @@ public boolean getValue(Property<Boolean> property, boolean def) {
         return (Boolean) value;
     }
 
+    public <T extends Comparable<T>> T getValue(Property<T> property, T def) {
+        var value = get(property);
+        if (value == null) {
+            return def;
+        }
+        //noinspection unchecked
+        return (T) value;
+    }
+
     @Nullable
     private Comparable<?> get(Property<?> property) {
         Property<?>[] keys = this.block.propertyKeys();

diff --git a/...va/org/geysermc/geyser/translator/level/block/entity/ShulkerBoxBlockEntityTranslator.java b/...va/org/geysermc/geyser/translator/level/block/entity/ShulkerBoxBlockEntityTranslator.java
@@ -30,6 +30,7 @@
 import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.level.block.property.Properties;
 import org.geysermc.geyser.level.block.type.BlockState;
+import org.geysermc.geyser.level.physics.Direction;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.inventory.ShulkerInventoryTranslator;
 import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType;
@@ -42,6 +43,6 @@ public class ShulkerBoxBlockEntityTranslator extends BlockEntityTranslator imple
      */
     @Override
     public void translateTag(GeyserSession session, NbtMapBuilder bedrockNbt, @Nullable NbtMap javaNbt, BlockState blockState) {
-        bedrockNbt.putByte("facing", (byte) blockState.getValue(Properties.FACING).ordinal());
+        bedrockNbt.putByte("facing", (byte) blockState.getValue(Properties.FACING, Direction.UP).ordinal());
     }
 }