random spawn option

EssentialsX · Jul 2, 2022 · 571fb8d · 571fb8d
1 parent 51ab2af
commit 571fb8d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/Essentials/src/main/java/com/earth2me/essentials/ISettings.java b/Essentials/src/main/java/com/earth2me/essentials/ISettings.java
@@ -101,7 +101,7 @@ public interface ISettings extends IConf {
 
     boolean getRespawnAtHome();
 
-    boolean isRandomRespawn();
+    String getRandomSpawnLocation();
 
     String getRandomRespawnLocation();
 

diff --git a/Essentials/src/main/java/com/earth2me/essentials/RandomTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/RandomTeleport.java
@@ -64,6 +64,10 @@ public void updateConfig() {
         }
     }
 
+    public boolean hasLocation(final String name) {
+        return config.hasProperty("locations." + name);
+    }
+
     public Location getCenter(final String name) {
         try {
             final LazyLocation center = config.getLocation(locationKey(name, "center"));

diff --git a/Essentials/src/main/java/com/earth2me/essentials/Settings.java b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
@@ -156,13 +156,13 @@ public boolean getRespawnAtHome() {
     }
 
     @Override
-    public boolean isRandomRespawn() {
-        return config.getBoolean("random-respawn", false);
+    public String getRandomSpawnLocation() {
+        return config.getString("random-spawn-location", "none");
     }
 
     @Override
     public String getRandomRespawnLocation() {
-        return config.getString("random-respawn-location", "world");
+        return config.getString("random-respawn-location", "none");
     }
 
     @Override

diff --git a/Essentials/src/main/resources/config.yml b/Essentials/src/main/resources/config.yml
@@ -1174,10 +1174,11 @@ respawn-at-home-bed: true
 # When users die, should EssentialsSpawn respect users' respawn anchors?
 respawn-at-anchor: false
 
-# When users die, should they respawn randomly?
-# The value of respawn-random-location will be the name of the location (set with /settpr) to teleport from.
-random-respawn: false
-random-respawn-location: world
+# If configured, users will spawn at the random spawn location instead of the newbies spawnpoint.
+random-spawn-location: "none"
+
+# If configured, when users die, they will respawn at the random respawn location.
+random-respawn-location: "none"
 
 # Teleport all joining players to the spawnpoint
 spawn-on-join: false

diff --git a/...tialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/...tialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
@@ -2,7 +2,6 @@
 
 import com.earth2me.essentials.Kit;
 import com.earth2me.essentials.OfflinePlayer;
-import com.earth2me.essentials.RandomTeleport;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.KeywordReplacer;
@@ -66,13 +65,9 @@ void onPlayerRespawn(final PlayerRespawnEvent event) {
                 event.setRespawnLocation(home);
                 return;
             }
-        } else if (ess.getSettings().isRandomRespawn()) {
-            final String name = ess.getSettings().getRandomRespawnLocation();
-            final RandomTeleport randomTeleport = ess.getRandomTeleport();
-            randomTeleport.getRandomLocation(name).thenAccept(location -> {
-                final CompletableFuture<Boolean> future = new CompletableFuture<>();
-                user.getAsyncTeleport().now(location, false, PlayerTeleportEvent.TeleportCause.COMMAND, future);
-            });
+        }
+        if (tryRandomTeleport(user, ess.getSettings().getRandomRespawnLocation())) {
+            return;
         }
         final Location spawn = spawns.getSpawn(user.getGroup());
         if (spawn != null) {
@@ -112,7 +107,9 @@ private void delayedJoin(final Player player) {
 
         final User user = ess.getUser(player);
 
-        if (!"none".equalsIgnoreCase(ess.getSettings().getNewbieSpawn())) {
+        final boolean spawnRandomly = tryRandomTeleport(user, ess.getSettings().getRandomSpawnLocation());
+
+        if (!spawnRandomly && !"none".equalsIgnoreCase(ess.getSettings().getNewbieSpawn())) {
             ess.scheduleSyncDelayedTask(new NewPlayerTeleport(user), 1L);
         }
 
@@ -169,4 +166,15 @@ public void run() {
             }
         }
     }
+
+    private boolean tryRandomTeleport(final User user, final String name) {
+        if (!ess.getRandomTeleport().hasLocation(name)) {
+            return false;
+        }
+        ess.getRandomTeleport().getRandomLocation(name).thenAccept(location -> {
+            final CompletableFuture<Boolean> future = new CompletableFuture<>();
+            user.getAsyncTeleport().now(location, false, PlayerTeleportEvent.TeleportCause.PLUGIN, future);
+        });
+        return true;
+    }
 }