From cec4cfe45790b0c104065910458b42f669633219 Mon Sep 17 00:00:00 2001
From: IzzelAliz <csh2001331@126.com>
Date: Tue, 11 Aug 2020 20:48:25 +0800
Subject: [PATCH] Fix bed location is not stored. (#21)

---
 .../core/server/management/PlayerListMixin.java     | 13 ++-----------
 .../arclight/common/mod/util/ArclightCaptures.java  |  6 +-----
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java
index 480e79cd..e680a503 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java
@@ -241,7 +241,7 @@ public abstract class PlayerListMixin implements PlayerListBridge {
                     isBedSpawn = true;
                     location = new Location(cworld, vec3d.x, vec3d.y, vec3d.z);
                 } else {
-                    playerIn.setRespawnPosition(null, true, false);
+                    this.bridge$setSpawnPoint(playerIn, null, true, playerIn.dimension, false);
                     playerIn.connection.sendPacket(new SChangeGameStatePacket(0, 0.0f));
                 }
             }
@@ -414,16 +414,6 @@ public abstract class PlayerListMixin implements PlayerListBridge {
         serverplayerentity.connection.captureCurrentPosition();
 
         this.setPlayerGameTypeBasedOnOther(serverplayerentity, playerIn, serverworld);
-        if (blockpos != null) {
-            Optional<Vec3d> optional = PlayerEntity.checkBedValidRespawnPosition(this.server.getWorld(playerIn.dimension), blockpos, flag);
-            if (optional.isPresent()) {
-                Vec3d vec3d = optional.get();
-                serverplayerentity.setLocationAndAngles(vec3d.x, vec3d.y, vec3d.z, 0.0F, 0.0F);
-                this.bridge$setSpawnPoint(serverplayerentity, blockpos, flag, dimension, false);
-            } else {
-                serverplayerentity.connection.sendPacket(new SChangeGameStatePacket(0, 0.0F));
-            }
-        }
 
         while (avoidSuffocation && !this.bridge$worldNoCollision(serverworld, serverplayerentity) && serverplayerentity.posY < 256.0D) {
             serverplayerentity.setPosition(serverplayerentity.posX, serverplayerentity.posY + 1.0D, serverplayerentity.posZ);
@@ -461,6 +451,7 @@ public abstract class PlayerListMixin implements PlayerListBridge {
         }
 
         BasicEventHooks.firePlayerRespawnEvent(serverplayerentity, conqueredEnd);
+        System.out.println("pos " + serverplayerentity.getBedLocation());
         return serverplayerentity;
     }
 
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCaptures.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCaptures.java
index 621afce5..05e027b1 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCaptures.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCaptures.java
@@ -102,11 +102,7 @@ public class ArclightCaptures {
     private static Hand placeEventHand;
 
     public static void capturePlaceEventHand(Hand hand) {
-        if (ArclightCaptures.placeEventHand == null) {
-            ArclightCaptures.placeEventHand = hand;
-        } else {
-            recapture("place hand");
-        }
+        ArclightCaptures.placeEventHand = hand;
     }
 
     public static Hand getPlaceEventHand(Hand hand) {