- Fixed the "map server claims to have char online, but this other map server also has it tagged as online" message triggering in some cases where it shouldn't.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8846 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 6 insertions, 2 deletions

diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index e9709b5d3..df1ed6b2e 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -222,8 +222,12 @@ void set_char_online(int map_id, int char_id, int account_id) {
 	character = idb_ensure(online_char_db, account_id, create_online_char_data);

 	if (online_check && character->char_id != -1 && character->server > -1 && character->server != map_id)

 	{

-		ShowNotice("set_char_online: Character %d:%d marked in map server %d, but map server %d claims to have (%d:%d) online!\n",

-			character->account_id, character->char_id, character->server, map_id, account_id, char_id);

+		//char == 99 <- Character logging in, so someone has logged in while one

+		//char is still on map-server, so kick him out, but don't print "error"

+		//as this is normal behaviour. [Skotlex]

+		if (char_id != 99)

+			ShowNotice("set_char_online: Character %d:%d marked in map server %d, but map server %d claims to have (%d:%d) online!\n",

+				character->account_id, character->char_id, character->server, map_id, account_id, char_id);

 		mapif_disconnectplayer(server_fd[character->server], character->account_id, character->char_id, 2);

 	}

 	character->char_id = (char_id==99)?-1:char_id;