update

Author: miyabi033

src/main/java/net/azisaba/lgw/core/configs/SpawnsConfig.java

@@ -4,8 +4,11 @@
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import net.azisaba.lgw.core.LeonGunWar;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.configuration.InvalidConfigurationException;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -15,37 +18,57 @@
 @Getter
 public class SpawnsConfig extends Config {
 
-    private Map<String, Location> spawns;
-    private Location lobby;
-    private Location onsen;
+    // 位置データは“文字列の world 名＋座標”だけ持つ
+    private static class Pos {
+        final String worldName;
+        final double x, y, z;
+        final float yaw, pitch;
+        Pos(String worldName, double x, double y, double z, float yaw, float pitch) {
+            this.worldName = worldName; this.x=x; this.y=y; this.z=z; this.yaw=yaw; this.pitch=pitch;
+        }
+    }
+
+    private Map<String, Pos> spawns;  // ← Location ではなく Pos を保存
 
     public SpawnsConfig(@NonNull LeonGunWar plugin) {
         super(plugin, "configs/spawns.yml", "spawns.yml");
     }
 
-    @SneakyThrows(value = {Exception.class})
     @Override
     public void loadConfig() throws IOException, InvalidConfigurationException {
         super.loadConfig();
 
-        spawns = new HashMap<>();
+        Map<String, Pos> map = new HashMap<>();
         for (String spawnName : config.getValues(false).keySet()) {
-            Location spawn = new Location(
-                    plugin.getServer().getWorld(config.getString(spawnName + ".world")),
+            String w = config.getString(spawnName + ".world");
+            Pos p = new Pos(
+                    w,
                     config.getDouble(spawnName + ".x"),
                     config.getDouble(spawnName + ".y"),
                     config.getDouble(spawnName + ".z"),
                     (float) config.getDouble(spawnName + ".yaw"),
-                    (float) config.getDouble(spawnName + ".pitch"));
-            spawns.put(spawnName, spawn);
+                    (float) config.getDouble(spawnName + ".pitch")
+            );
+            map.put(spawnName, p);
         }
-        spawns = Collections.unmodifiableMap(spawns);
-
-        lobby = spawns.get("lobby");
-        onsen = spawns.get("onsen");
+        spawns = Collections.unmodifiableMap(map);
     }
 
-    public Location getLobby() {
-        return lobby;
+    /** 使う直前に World を解決。null のときは null を返す（呼び出し側でフォールバック） */
+    public @Nullable Location get(String name) {
+        Pos p = spawns.get(name);
+        if (p == null) {
+            Bukkit.getLogger().warning("[LGW] spawn '" + name + "' not found in spawns.yml");
+            return null;
+        }
+        World w = plugin.getServer().getWorld(p.worldName);
+        if (w == null) {
+            Bukkit.getLogger().warning("[LGW] spawn '" + name + "' world not loaded or not found: " + p.worldName);
+            return null;
+        }
+        return new Location(w, p.x, p.y, p.z, p.yaw, p.pitch);
     }
-}
+
+    public @Nullable Location getLobby() { return get("lobby"); }
+    public @Nullable Location getOnsen() { return get("onsen"); }
+}

src/main/java/net/azisaba/lgw/core/listeners/signs/MatchModeSignListener.java

@@ -47,7 +47,7 @@ public class MatchModeSignListener implements Listener {
 
     public MatchModeSignListener() {
         defaultItem = create(Material.EMERALD_BLOCK, Chat.f("&e通常のチーム分け&aで開始！"));
-        kdItem = create(Material.DIAMOND_BLOCK, Chat.f("&cK/Dのチーム分け&aで開始！"));
+        kdItem = create(Material.DIAMOND_BLOCK, Chat.f("&cK/Dのチーム分け&aで開始！(無効化中)"));
     }
 
     /**
@@ -195,7 +195,7 @@ public void onInventoryClick(InventoryClickEvent e) {
         if (clicked.isSimilar(defaultItem)) {
             distributor = new DefaultTeamDistributor();
         } else if (clicked.isSimilar(kdItem)) {
-            distributor = new KDTeamDistributor();
+            distributor = new DefaultTeamDistributor();
         }
 
         if (distributor == null) {

src/main/resources/plugin.yml

@@ -4,6 +4,7 @@ version: ${version}
 authors: ["siloneco", "YukiLeafX", "matsu1213", "Arisa9006", "sysnote8main"]
 description: ${description}
 website: ${websiteUrl}
+load: POSTWORLD
 depend: ["CrackShot", "Essentials", "WorldGuard", "PlayerSettings", "KDStatusReloaded", "NameChangeAutomation", "LuckPerms"]
 softdepend: ["Multiverse-Core", "PlaceholderAPI"]
 api-version: 1.16