From 77f67e2a0e3a19d7481e89c20b76b3f9045fb5f3 Mon Sep 17 00:00:00 2001
From: mobius <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 10 Feb 2015 05:31:22 +0000
Subject: [PATCH] Small changes on server startup messages.

---
 .../com/l2jserver/gameserver/GameServer.java  | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/trunk/java/com/l2jserver/gameserver/GameServer.java b/trunk/java/com/l2jserver/gameserver/GameServer.java
index 9d37a8f513..b393f11e40 100644
--- a/trunk/java/com/l2jserver/gameserver/GameServer.java
+++ b/trunk/java/com/l2jserver/gameserver/GameServer.java
@@ -188,8 +188,6 @@ public class GameServer
 	{
 		long serverLoadStart = System.currentTimeMillis();
 		
-		_log.info(getClass().getSimpleName() + ": Used memory: " + getUsedMemoryMB() + "MB");
-		
 		if (!IdFactory.getInstance().isInitialized())
 		{
 			_log.severe(getClass().getSimpleName() + ": Could not read object IDs from DB. Please check your data.");
@@ -281,12 +279,17 @@ public class GameServer
 		ClanEntryManager.getInstance();
 		
 		printSection("Geodata");
+		long geodataMemory = getUsedMemoryMB();
 		GeoData.getInstance();
-		
 		if (Config.PATHFINDING > 0)
 		{
 			PathFinding.getInstance();
 		}
+		geodataMemory -= getUsedMemoryMB();
+		if (geodataMemory < 0)
+		{
+			geodataMemory = 0;
+		}
 		
 		printSection("NPCs");
 		SkillLearnData.getInstance();
@@ -422,13 +425,11 @@ public class GameServer
 			_deadDetectThread = null;
 		}
 		System.gc();
-		// maxMemory is the upper limit the jvm can use, totalMemory the size of
-		// the current allocation pool, freeMemory the unused memory in the allocation pool
-		long freeMem = ((Runtime.getRuntime().maxMemory() - Runtime.getRuntime().totalMemory()) + Runtime.getRuntime().freeMemory()) / 1048576;
-		long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
-		_log.info(getClass().getSimpleName() + ": Started, free memory " + freeMem + " Mb of " + totalMem + " Mb");
-		Toolkit.getDefaultToolkit().beep();
-		LoginServerThread.getInstance().start();
+		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
+		_log.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
+		_log.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
+		_log.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
+		_log.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		
 		final SelectorConfig sc = new SelectorConfig();
 		sc.MAX_READ_PER_PASS = Config.MMO_MAX_READ_PER_PASS;
@@ -465,8 +466,8 @@ public class GameServer
 			System.exit(1);
 		}
 		
-		_log.log(Level.INFO, getClass().getSimpleName() + ": Maximum numbers of connected players: " + Config.MAXIMUM_ONLINE_USERS);
-		_log.log(Level.INFO, getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
+		LoginServerThread.getInstance().start();
+		Toolkit.getDefaultToolkit().beep();
 	}
 	
 	public static void main(String[] args) throws Exception
@@ -497,10 +498,6 @@ public class GameServer
 		{
 			new Status(Server.serverMode).start();
 		}
-		else
-		{
-			_log.info(GameServer.class.getSimpleName() + ": Telnet server is currently disabled.");
-		}
 	}
 	
 	public static void printSection(String s)