From 0d7bf7b71a62abed27af6dc214ecdcf5d7d9d1f3 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Fri, 26 Nov 2021 21:05:14 -0500
Subject: [PATCH] Fix NPEs when loading in chunks with double chests

---
 .../level/block/entity/BlockEntityTranslator.java     | 11 -----------
 .../entity/DoubleChestBlockEntityTranslator.java      |  9 ++++-----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntityTranslator.java
index 03e2bb3de..602ac140c 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/BlockEntityTranslator.java
@@ -27,8 +27,6 @@ package org.geysermc.geyser.translator.level.block.entity;
 
 import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.opennbt.tag.builtin.IntTag;
-import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.nukkitx.nbt.NbtMap;
 import com.nukkitx.nbt.NbtMapBuilder;
@@ -49,15 +47,6 @@ public abstract class BlockEntityTranslator {
         return tagBuilder.build();
     }
 
-    protected CompoundTag getConstantJavaTag(String javaId, int x, int y, int z) {
-        CompoundTag tag = new CompoundTag("");
-        tag.put(new IntTag("x", x));
-        tag.put(new IntTag("y", y));
-        tag.put(new IntTag("z", z));
-        tag.put(new StringTag("id", javaId));
-        return tag;
-    }
-
     protected NbtMapBuilder getConstantBedrockTag(String bedrockId, int x, int y, int z) {
         return NbtMap.builder()
                 .putInt("x", x)
diff --git a/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/DoubleChestBlockEntityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/DoubleChestBlockEntityTranslator.java
index e41f9e492..b6a10dd8f 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/DoubleChestBlockEntityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/level/block/entity/DoubleChestBlockEntityTranslator.java
@@ -46,18 +46,17 @@ public class DoubleChestBlockEntityTranslator extends BlockEntityTranslator impl
 
     @Override
     public void updateBlock(GeyserSession session, int blockState, Vector3i position) {
-        CompoundTag javaTag = getConstantJavaTag("chest", position.getX(), position.getY(), position.getZ());
         NbtMapBuilder tagBuilder = getConstantBedrockTag(BlockEntityUtils.getBedrockBlockEntityId(BlockEntityType.CHEST), position.getX(), position.getY(), position.getZ());
-        translateTag(tagBuilder, javaTag, blockState);
+        translateTag(tagBuilder, null, blockState);
         BlockEntityUtils.updateBlockEntity(session, tagBuilder.build(), position);
     }
 
     @Override
     public void translateTag(NbtMapBuilder builder, CompoundTag tag, int blockState) {
-        DoubleChestValue chestValues = BlockStateValues.getDoubleChestValues().getOrDefault(blockState, null);
+        DoubleChestValue chestValues = BlockStateValues.getDoubleChestValues().get(blockState);
         if (chestValues != null) {
-            int x = (int) tag.getValue().get("x").getValue();
-            int z = (int) tag.getValue().get("z").getValue();
+            int x = (int) builder.get("x");
+            int z = (int) builder.get("z");
             translateChestValue(builder, chestValues, x, z);
         }
     }