config for random spawn in town and renamed the old config, thanks Notorious

L2_GameServer/java/com/l2jserver/Config.java

@@ -181,8 +181,9 @@ public final class Config
 	public static int UNSTUCK_INTERVAL;
 	public static int TELEPORT_WATCHDOG_TIMEOUT;
 	public static int PLAYER_SPAWN_PROTECTION;
-	public static boolean RESPAWN_RANDOM_ENABLED;
-	public static int RESPAWN_RANDOM_MAX_OFFSET;
+	public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED;
+	public static boolean OFFSET_ON_TELEPORT_ENABLED;
+	public static int MAX_OFFSET_ON_TELEPORT;
 	public static boolean RESTORE_PLAYER_INSTANCE;
 	public static boolean ALLOW_SUMMON_TO_INSTANCE;
 	public static boolean PETITIONING_ALLOWED;
@@ -1480,8 +1481,9 @@ public final class Config
 					UNSTUCK_INTERVAL = Integer.parseInt(Character.getProperty("UnstuckInterval", "300"));
 					TELEPORT_WATCHDOG_TIMEOUT = Integer.parseInt(Character.getProperty("TeleportWatchdogTimeout", "0"));
 					PLAYER_SPAWN_PROTECTION = Integer.parseInt(Character.getProperty("PlayerSpawnProtection", "0"));
-					RESPAWN_RANDOM_ENABLED = Boolean.parseBoolean(Character.getProperty("RespawnRandomInTown", "True"));
-					RESPAWN_RANDOM_MAX_OFFSET = Integer.parseInt(Character.getProperty("RespawnRandomMaxOffset", "50"));
+					RANDOM_RESPAWN_IN_TOWN_ENABLED = Boolean.parseBoolean(Character.getProperty("RandomRespawnInTownEnabled", "True"));
+					OFFSET_ON_TELEPORT_ENABLED = Boolean.parseBoolean(Character.getProperty("OffsetOnTeleportEnabled", "True"));
+					MAX_OFFSET_ON_TELEPORT = Integer.parseInt(Character.getProperty("MaxOffsetOnTeleport", "50"));
 					RESTORE_PLAYER_INSTANCE = Boolean.parseBoolean(Character.getProperty("RestorePlayerInstance", "False"));
 					ALLOW_SUMMON_TO_INSTANCE = Boolean.parseBoolean(Character.getProperty("AllowSummonToInstance", "True"));
 					PETITIONING_ALLOWED = Boolean.parseBoolean(Character.getProperty("PetitioningAllowed", "True"));

L2_GameServer/java/com/l2jserver/accountmanager/SQLAccountManager.java

@@ -281,7 +281,7 @@ public class SQLAccountManager
                     
                     String clanName = rcln.getString("clan_name");
                     
-                    System.out.println("Deleting clan " + rcln.getString("clan_name") + ".");
+                    System.out.println("Deleting clan " + clanName + ".");
                     
                     // Delete Clan Wars
                     statement.close();

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java

@@ -197,6 +197,7 @@ public class ClanHallManager
 			return _clanHall.get(clanHallId);
 		if (_freeClanHall.containsKey(clanHallId))
 			return _freeClanHall.get(clanHallId);
+		_log.warning("Clan hall id " + clanHallId + " not found in clanhall table!");
 		return null;
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -597,10 +597,10 @@ public abstract class L2Character extends L2Object
 
 		getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
 
-        if (Config.RESPAWN_RANDOM_ENABLED && allowRandomOffset)
+        if (Config.OFFSET_ON_TELEPORT_ENABLED && allowRandomOffset)
         {
-            x += Rnd.get(-Config.RESPAWN_RANDOM_MAX_OFFSET, Config.RESPAWN_RANDOM_MAX_OFFSET);
-            y += Rnd.get(-Config.RESPAWN_RANDOM_MAX_OFFSET, Config.RESPAWN_RANDOM_MAX_OFFSET);
+            x += Rnd.get(-Config.MAX_OFFSET_ON_TELEPORT, Config.MAX_OFFSET_ON_TELEPORT);
+            y += Rnd.get(-Config.MAX_OFFSET_ON_TELEPORT, Config.MAX_OFFSET_ON_TELEPORT);
         }
 
         z += 5;

L2_GameServer/java/com/l2jserver/gameserver/model/zone/L2SpawnZone.java

@@ -18,6 +18,7 @@ import java.util.List;
 
 import javolution.util.FastList;
 
+import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.util.Rnd;
 
@@ -54,7 +55,10 @@ public abstract class L2SpawnZone extends L2ZoneType
 
 	public Location getSpawnLoc()
 	{
-		return _spawnLocs.get(Rnd.get(_spawnLocs.size()));
+		if (Config.RANDOM_RESPAWN_IN_TOWN_ENABLED)
+			return _spawnLocs.get(Rnd.get(_spawnLocs.size()));
+		else
+			return _spawnLocs.get(0);
 	}
 
 	public Location getChaoticSpawnLoc()

L2_GameServer/java/config/Character.properties

@@ -573,11 +573,16 @@ TeleportWatchdogTimeout = 0
 # Default: 0
 PlayerSpawnProtection = 0
 
-# This will allow random re-spawning in towns if enabled based on a maximum random offset from the base re-spawn coordinates.
-# DEFAULT NEEDS TO BE VERIFIED, MUST BE CHANGED HERE AND IN CONFIG.JAVA IF NOT CORRECT
-# Default: True, 50
-RespawnRandomInTown = True
-RespawnRandomMaxOffset = 50
+# If enabled, players respawn in town on different locations defined in zone.xml for given town.
+# If disabled the first spawn location from zone.xml is used.
+# Default: True
+RandomRespawnInTownEnabled = True
+# This will allow a random offset from the base teleport location coordinates based on a maximum offset.
+# Default: True
+OffsetOnTeleportEnabled = True
+# Maximum offset for base teleport location when OffsetOnTeleportEnabled is enabled .
+# Default: 50
+MaxOffsetOnTeleport = 50
 
 # Restores the player to their previous instance (ie. an instanced area/dungeon) on EnterWorld.
 # Default: False