Merge branch 'server-renderer' into 1.20.4

NiFeather · Dec 25, 2023 · eb823f3 · eb823f3
2 parents 5cbc2c8 + 12a224a
commit eb823f3
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/...orph/backends/server/renderer/network/datawatcher/watchers/types/LivingEntityWatcher.java b/...orph/backends/server/renderer/network/datawatcher/watchers/types/LivingEntityWatcher.java
@@ -3,6 +3,7 @@
 import io.papermc.paper.event.player.PlayerStopUsingItemEvent;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.minecraft.core.BlockPos;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.entity.EntityType;
@@ -20,6 +21,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 public class LivingEntityWatcher extends EntityWatcher implements Listener
 {
@@ -102,6 +104,24 @@ protected void doSync()
         write(values.STUCKED_ARROWS, player.getArrowsInBody());
         write(values.BEE_STINGERS, player.getBeeStingersInBody());
 
+        Optional<BlockPos> bedPos = Optional.empty();
+        if (player.isSleeping())
+        {
+            try
+            {
+                var bukkitPos = player.getBedLocation();
+                bedPos = Optional.of(
+                        new BlockPos(bukkitPos.blockX(),bukkitPos.blockY(), bukkitPos.blockZ())
+                );
+            }
+            catch (Throwable t)
+            {
+                logger.warn("Error occurred while processing bed pos: " + t.getMessage());
+            }
+        }
+
+        write(values.BED_POS, bedPos);
+
         super.doSync();
     }
 }