Improving default Fallback-Spawn and Lobby locations

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/Config.java

@@ -101,13 +101,13 @@ public class Config {
         cfg.addDefault("fightstats.enable", false);
         cfg.addDefault("fightstats.show_real_skins", true);
 
-        Location spawnLocation = Bukkit.getWorlds().get(0).getSpawnLocation().add(25, 0, 25);
-        cfg.addDefault("fallback_spawn.world", spawnLocation.getWorld().getName());
-        cfg.addDefault("fallback_spawn.x", spawnLocation.getX());
-        cfg.addDefault("fallback_spawn.y", spawnLocation.getY());
-        cfg.addDefault("fallback_spawn.z", spawnLocation.getZ());
-        cfg.addDefault("fallback_spawn.yaw", spawnLocation.getYaw());
-        cfg.addDefault("fallback_spawn.pitch", spawnLocation.getPitch());
+        Location worldSpawnLoc = Bukkit.getWorlds().get(0).getSpawnLocation();
+        cfg.addDefault("fallback_spawn.world", worldSpawnLoc.getWorld().getName());
+        cfg.addDefault("fallback_spawn.x", worldSpawnLoc.getX());
+        cfg.addDefault("fallback_spawn.y", worldSpawnLoc.getY());
+        cfg.addDefault("fallback_spawn.z", worldSpawnLoc.getZ());
+        cfg.addDefault("fallback_spawn.yaw", worldSpawnLoc.getYaw());
+        cfg.addDefault("fallback_spawn.pitch", worldSpawnLoc.getPitch());
 
         cfg.addDefault("mysql.host", "localhost");
         cfg.addDefault("mysql.database", "db");

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/lobby/Lobby.java

@@ -20,6 +20,7 @@ package de.butzlabben.missilewars.configuration.lobby;
 
 import com.google.gson.annotations.SerializedName;
 import de.butzlabben.missilewars.Logger;
+import de.butzlabben.missilewars.configuration.Config;
 import de.butzlabben.missilewars.configuration.arena.AreaConfiguration;
 import de.butzlabben.missilewars.configuration.arena.Arena;
 import de.butzlabben.missilewars.game.Arenas;
@@ -59,9 +60,9 @@ public class Lobby {
     @SerializedName("team_1") private GameTeamConfiguration team1Config = new GameTeamConfiguration("Team1", "&c");
     @SerializedName("team_2") private GameTeamConfiguration team2Config = new GameTeamConfiguration("Team2", "&a");
     @SerializedName("team_spectator") private GameTeamConfiguration teamConfigSpec = new GameTeamConfiguration("Spectator", "&f");
-    @Setter @SerializedName("spawn_point") private Location spawnPoint = getBukkitDefaultWorld().getSpawnLocation();
-    @Setter @SerializedName("after_game_spawn") private Location afterGameSpawn = getBukkitDefaultWorld().getSpawnLocation();
-    @Setter @SerializedName("area") private AreaConfiguration areaConfig = AreaConfiguration.aroundLocation(getBukkitDefaultWorld().getSpawnLocation(), 30);
+    @Setter @SerializedName("spawn_point") private Location spawnPoint = Config.getFallbackSpawn().add(40, 0, 0);
+    @Setter @SerializedName("after_game_spawn") private Location afterGameSpawn = Config.getFallbackSpawn();
+    @Setter @SerializedName("area") private AreaConfiguration areaConfig = AreaConfiguration.aroundLocation(spawnPoint, 20);
     @SerializedName("map_choose_procedure") private MapChooseProcedure mapChooseProcedure = MapChooseProcedure.FIRST;
     @SerializedName("join_ongoing_game") private JoinIngameBehavior joinIngameBehavior = JoinIngameBehavior.SPECTATOR;
     @SerializedName("rejoin_ongoing_game") private RejoinIngameBehavior rejoinIngameBehavior = RejoinIngameBehavior.LAST_TEAM;