From 18e5764b54bdca457ae821cedcae14844e8d2c36 Mon Sep 17 00:00:00 2001
From: David Choo <davchoo3@gmail.com>
Date: Sat, 7 Nov 2020 17:04:39 -0500
Subject: [PATCH] Move Bed Position metadata to the right class

---
 .../java/org/geysermc/connector/entity/Entity.java | 11 -----------
 .../geysermc/connector/entity/LivingEntity.java    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/entity/Entity.java b/connector/src/main/java/org/geysermc/connector/entity/Entity.java
index 121e96a28..e579f4e9f 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/Entity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/Entity.java
@@ -348,17 +348,6 @@ public class Entity {
                     metadata.put(EntityData.PLAYER_FLAGS, (byte) 0);
                 }
                 break;
-            case 13: // Bed Position
-                Position bedPosition = (Position) entityMetadata.getValue();
-                if (bedPosition != null) {
-                    metadata.put(EntityData.BED_POSITION, Vector3i.from(bedPosition.getX(), bedPosition.getY(), bedPosition.getZ()));
-                    if (session.getConnector().getConfig().isCacheChunks()) {
-                        int bed = session.getConnector().getWorldManager().getBlockAt(session, bedPosition);
-                        // Bed has to be updated, or else player is floating in the air
-                        ChunkUtils.updateBlock(session, bed, bedPosition);
-                    }
-                }
-                break;
         }
     }
 
diff --git a/connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java b/connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java
index ae9eaee5f..345c19dea 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/LivingEntity.java
@@ -26,7 +26,9 @@
 package org.geysermc.connector.entity;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
 import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.protocol.bedrock.data.AttributeData;
 import com.nukkitx.protocol.bedrock.data.entity.EntityData;
 import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
@@ -42,6 +44,7 @@ import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.item.ItemRegistry;
 import org.geysermc.connector.utils.AttributeUtils;
+import org.geysermc.connector.utils.ChunkUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -84,6 +87,17 @@ public class LivingEntity extends Entity {
             case 10:
                 metadata.put(EntityData.EFFECT_AMBIENT, (byte) ((boolean) entityMetadata.getValue() ? 1 : 0));
                 break;
+            case 13: // Bed Position
+                Position bedPosition = (Position) entityMetadata.getValue();
+                if (bedPosition != null) {
+                    metadata.put(EntityData.BED_POSITION, Vector3i.from(bedPosition.getX(), bedPosition.getY(), bedPosition.getZ()));
+                    if (session.getConnector().getConfig().isCacheChunks()) {
+                        int bed = session.getConnector().getWorldManager().getBlockAt(session, bedPosition);
+                        // Bed has to be updated, or else player is floating in the air
+                        ChunkUtils.updateBlock(session, bed, bedPosition);
+                    }
+                }
+                break;
         }
 
         super.updateBedrockMetadata(entityMetadata, session);