From 728e8b74866a40b7623a9fc2fcbe1069fd129059 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Sat, 8 Feb 2025 23:01:43 +0100 Subject: [PATCH] Add configurable respawn time to GameConfig Introduced a new RESPAWN section in GameConfig for managing respawn time settings. Updated OnPlayerDeath to use the configurable value instead of a hardcoded duration. This allows greater flexibility for game configuration. --- src/main/java/com/alttd/ctf/config/GameConfig.java | 11 +++++++++++ src/main/java/com/alttd/ctf/events/OnPlayerDeath.java | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/alttd/ctf/config/GameConfig.java b/src/main/java/com/alttd/ctf/config/GameConfig.java index 33929c2..2510246 100644 --- a/src/main/java/com/alttd/ctf/config/GameConfig.java +++ b/src/main/java/com/alttd/ctf/config/GameConfig.java @@ -96,4 +96,15 @@ public class GameConfig extends AbstractConfig { } } + public static class RESPAWN { + private static final String prefix = "respawn."; + + public static int TIME = 10; + + @SuppressWarnings("unused") + private static void load() { + TIME = config.getInt(prefix, "time", TIME); + } + } + } diff --git a/src/main/java/com/alttd/ctf/events/OnPlayerDeath.java b/src/main/java/com/alttd/ctf/events/OnPlayerDeath.java index beac107..ea07a89 100644 --- a/src/main/java/com/alttd/ctf/events/OnPlayerDeath.java +++ b/src/main/java/com/alttd/ctf/events/OnPlayerDeath.java @@ -2,6 +2,7 @@ package com.alttd.ctf.events; import com.alttd.ctf.Main; import com.alttd.ctf.config.Config; +import com.alttd.ctf.config.GameConfig; import com.alttd.ctf.game.GameManager; import com.alttd.ctf.game.GamePhase; import com.alttd.ctf.team.TeamPlayer; @@ -55,7 +56,7 @@ public class OnPlayerDeath implements Listener { } TeamPlayer teamPlayer = optionalTeamPlayer.get(); event.setRespawnLocation(player.getWorld().getSpawnLocation()); - Bukkit.getScheduler().runTaskLater(main, () -> teamPlayer.getGameClass().apply(teamPlayer, worldBorderApi, gamePhase.get(), true), Config.SETTINGS * 20);//10 x 20 ticks aka 10 seconds + Bukkit.getScheduler().runTaskLater(main, () -> teamPlayer.getGameClass().apply(teamPlayer, worldBorderApi, gamePhase.get(), true), GameConfig.RESPAWN.TIME * 20L);//10 x 20 ticks aka 10 seconds } }