GH-572 Add support to respawn points (#574)

* Add support to respawn * Add missing comment
EternalCodeTeam · Dec 10, 2023 · d6f1514 · d6f1514
1 parent 2c55b55
commit d6f1514
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/.../src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java b/.../src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java
@@ -93,6 +93,9 @@ public static class Teleport implements SpawnSettings {
         @Description("# Teleports the player to spawn after death")
         public boolean teleportToSpawnOnDeath = true;
 
+        @Description("# Teleports the player to respawn point after death")
+        public boolean teleportToRespawnPoint = true;
+
         @Description("# Time of teleportation to spawn")
         public Duration teleportTimeToSpawn = Duration.ofSeconds(5);
 

diff --git a/...nalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnRespawnController.java b/...nalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnRespawnController.java
@@ -33,6 +33,10 @@ class SpawnRespawnController implements Listener {
     void onPlayerRespawn(PlayerRespawnEvent event) {
         Player player = event.getPlayer();
 
+        if (this.config.teleport.teleportToRespawnPoint && this.hasRespawnPoint(player)) {
+            return;
+        }
+
         Position spawnPosition = this.locations.spawn;
 
         if (this.config.teleport.teleportToSpawnOnDeath && !Objects.equals(spawnPosition.getWorld(), Position.NONE_WORLD)) {
@@ -41,4 +45,8 @@ void onPlayerRespawn(PlayerRespawnEvent event) {
         }
     }
 
+    boolean hasRespawnPoint(Player player) {
+        return player.getBedSpawnLocation() != null;
+    }
+
 }
diff --git a/eternalcore-plugin/build.gradle.kts b/eternalcore-plugin/build.gradle.kts
@@ -34,6 +34,6 @@ eternalShadowCompiler {
 
 tasks {
     runServer {
-        minecraftVersion("1.20.1")
+        minecraftVersion("1.20")
     }
 }