fix: don't teleport users locally to beds if broken

WiIIiam278 · Dec 26, 2023 · bcac151 · bcac151
1 parent 69159d1
commit bcac151
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/common/src/main/java/net/william278/huskhomes/listener/EventListener.java b/common/src/main/java/net/william278/huskhomes/listener/EventListener.java
@@ -256,12 +256,18 @@ private void respawnGlobally(@NotNull OnlineUser onlineUser) {
 
         plugin.getDatabase()
                 .getRespawnPosition(onlineUser)
+                .flatMap(pos -> {
+                    if (pos.getServer().equals(plugin.getServerName()) && onlineUser.getBedSpawnPosition().isEmpty()) {
+                        return Optional.empty();
+                    }
+                    return Optional.of(pos);
+                })
                 .or(() -> {
                     builder.type(Teleport.Type.TELEPORT);
                     return plugin.getSpawn();
                 })
-                .ifPresent(position -> {
-                    builder.target(position);
+                .ifPresent(pos -> {
+                    builder.target(pos);
                     try {
                         builder.toTeleport().execute();
                     } catch (TeleportationException e) {