consider the spawn island when teleporting

add an option to forcefully use the specified location
BentoBoxWorld · Mar 19, 2023 · c881b20 · c881b20
1 parent 4dd9091
commit c881b20
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/me/hsgamer/autoislandpurge/Settings.java b/src/main/java/me/hsgamer/autoislandpurge/Settings.java
@@ -14,6 +14,7 @@ public class Settings {
     private long checkTicks = 300;
     private long deleteTicks = 10;
     private Location spawnLocation;
+    private boolean forcedSpawnLocation;
 
     public Settings(AutoIslandPurge addon) {
         this.addon = addon;
@@ -42,6 +43,7 @@ public void setup() {
         } catch (Exception e) {
             // IGNORED
         }
+        forcedSpawnLocation = config.getBoolean("forced-spawn-location", forcedSpawnLocation);
     }
 
     public List<GameModeAddon> getEnabledGameModes() {
@@ -67,4 +69,8 @@ public long getDeleteTicks() {
     public Location getSpawnLocation() {
         return spawnLocation;
     }
+
+    public boolean isForcedSpawnLocation() {
+        return forcedSpawnLocation;
+    }
 }
diff --git a/src/main/java/me/hsgamer/autoislandpurge/TeleportWhenIslandDeletedListener.java b/src/main/java/me/hsgamer/autoislandpurge/TeleportWhenIslandDeletedListener.java
@@ -1,10 +1,13 @@
 package me.hsgamer.autoislandpurge;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+import java.util.Optional;
+
 public record TeleportWhenIslandDeletedListener(AutoIslandPurge instance) implements Listener {
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
@@ -17,9 +20,14 @@ public void onJoin(PlayerJoinEvent event) {
         if (island.isPresent() && !island.get().isDeleted()) {
             return;
         }
-        var spawn = instance.getSettings().getSpawnLocation();
-        if (spawn != null) {
-            Bukkit.getScheduler().runTask(instance.getPlugin(), () -> player.teleport(spawn));
+
+        Location spawnLocation = Optional.ofNullable(location.getWorld())
+                .map(w -> instance.getIslands().getSpawnPoint(w))
+                .filter(l -> !instance.getSettings().isForcedSpawnLocation())
+                .orElseGet(() -> instance.getSettings().getSpawnLocation());
+
+        if (spawnLocation != null) {
+            Bukkit.getScheduler().runTask(instance.getPlugin(), () -> player.teleport(spawnLocation));
         }
     }
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -3,6 +3,7 @@ offline-days-until-purge: 7
 purge-island-member-size: 1
 check-islands-ticks: 300
 ticks-per-island-deleted: 10
+forced-spawn-location: false
 spawn-location:
   world: world
   x: 0