Skip to content

Commit de12aa6

Browse files
committed
Use saved position for login respawn
1 parent 6c026c3 commit de12aa6

1 file changed

Lines changed: 1 addition & 14 deletions

File tree

server/src/main/java/org/cloudburstmc/server/player/CloudPlayer.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,21 +1123,8 @@ protected void doFirstSpawn() {
11231123
setTimePacket.setTime(this.getLevel().getTime());
11241124
this.sendPacket(setTimePacket);
11251125

1126-
Location loc = this.findRespawnPosition();
1126+
Location loc = Location.from(this.getPosition(), this.getYaw(), this.getPitch(), this.getLevel());
11271127
Set<PlayerRespawnEvent.RespawnFlag> flags = EnumSet.of(PlayerRespawnEvent.RespawnFlag.FIRST_SPAWN);
1128-
if (loc != null) {
1129-
// Personal spawn block was valid
1130-
if (this.respawnConfig != null) {
1131-
if (this.respawnConfig.spawnType() == RespawnConfig.SpawnType.BED) {
1132-
flags.add(PlayerRespawnEvent.RespawnFlag.BED_SPAWN);
1133-
} else {
1134-
flags.add(PlayerRespawnEvent.RespawnFlag.ANCHOR_SPAWN);
1135-
}
1136-
}
1137-
} else {
1138-
CloudLevel spawnLevel = this.getLevel();
1139-
loc = spawnLevel == this.getServer().getDefaultLevel() ? spawnLevel.getSafeSpawn() : Location.from(this.getPosition(), this.getYaw(), this.getPitch(), spawnLevel);
1140-
}
11411128

11421129
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(this, loc, flags);
11431130
this.server.getEventManager().fire(respawnEvent);

0 commit comments

Comments
 (0)