diff --git a/src/char/char.c b/src/char/char.c
index edb7c014059..ec16883b725 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2656,718 +2656,725 @@ int parse_frommap(int fd)
 		return 0;
 	}
 
-	while(RFIFOREST(fd) >= 2)
-	{
-		switch(RFIFOW(fd,0))
-		{
+	while(RFIFOREST(fd) >= 2) {
+		
+		switch(RFIFOW(fd,0)) {
 
-		case 0x2afa: // Receiving map names list from the map-server
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
+			case 0x2b0a:
+				if( RFIFOREST(fd) < RFIFOW(fd, 2) )
+					return 0;
+				socket_datasync(fd, false);
+				RFIFOSKIP(fd,RFIFOW(fd,2));
+				break;
 
-			memset(server[id].map, 0, sizeof(server[id].map));
-			j = 0;
-			for(i = 4; i < RFIFOW(fd,2); i += 4) {
-				server[id].map[j] = RFIFOW(fd,i);
-				j++;
-			}
+					
+			case 0x2afa: // Receiving map names list from the map-server
+				if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+					return 0;
 
-			ShowStatus("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n",
-						id, j, CONVIP(server[id].ip), server[id].port);
-			ShowStatus("Map-server %d loading complete.\n", id);
+				memset(server[id].map, 0, sizeof(server[id].map));
+				j = 0;
+				for(i = 4; i < RFIFOW(fd,2); i += 4) {
+					server[id].map[j] = RFIFOW(fd,i);
+					j++;
+				}
 
-			// send name for wisp to player
-			WFIFOHEAD(fd, 3 + NAME_LENGTH);
-			WFIFOW(fd,0) = 0x2afb;
-			WFIFOB(fd,2) = 0;
-			memcpy(WFIFOP(fd,3), wisp_server_name, NAME_LENGTH);
-			WFIFOSET(fd,3+NAME_LENGTH);
+				ShowStatus("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n",
+							id, j, CONVIP(server[id].ip), server[id].port);
+				ShowStatus("Map-server %d loading complete.\n", id);
 
-			char_send_fame_list(fd); //Send fame list.
+				// send name for wisp to player
+				WFIFOHEAD(fd, 3 + NAME_LENGTH);
+				WFIFOW(fd,0) = 0x2afb;
+				WFIFOB(fd,2) = 0;
+				memcpy(WFIFOP(fd,3), wisp_server_name, NAME_LENGTH);
+				WFIFOSET(fd,3+NAME_LENGTH);
 
-			{
-			unsigned char buf[16384];
-			int x;
-			if (j == 0) {
-				ShowWarning("Map-server %d has NO maps.\n", id);
-			} else {
-				// Transmitting maps information to the other map-servers
-				WBUFW(buf,0) = 0x2b04;
-				WBUFW(buf,2) = j * 4 + 10;
-				WBUFL(buf,4) = htonl(server[id].ip);
-				WBUFW(buf,8) = htons(server[id].port);
-				memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 4);
-				mapif_sendallwos(fd, buf, WBUFW(buf,2));
-			}
-			// Transmitting the maps of the other map-servers to the new map-server
-			for(x = 0; x < ARRAYLENGTH(server); x++) {
-				if (server[x].fd > 0 && x != id) {
-					WFIFOHEAD(fd,10 +4*ARRAYLENGTH(server[x].map));
-					WFIFOW(fd,0) = 0x2b04;
-					WFIFOL(fd,4) = htonl(server[x].ip);
-					WFIFOW(fd,8) = htons(server[x].port);
-					j = 0;
-					for(i = 0; i < ARRAYLENGTH(server[x].map); i++)
-						if (server[x].map[i])
-							WFIFOW(fd,10+(j++)*4) = server[x].map[i];
-					if (j > 0) {
-						WFIFOW(fd,2) = j * 4 + 10;
-						WFIFOSET(fd,WFIFOW(fd,2));
+				char_send_fame_list(fd); //Send fame list.
+
+				{
+				unsigned char buf[16384];
+				int x;
+				if (j == 0) {
+					ShowWarning("Map-server %d has NO maps.\n", id);
+				} else {
+					// Transmitting maps information to the other map-servers
+					WBUFW(buf,0) = 0x2b04;
+					WBUFW(buf,2) = j * 4 + 10;
+					WBUFL(buf,4) = htonl(server[id].ip);
+					WBUFW(buf,8) = htons(server[id].port);
+					memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 4);
+					mapif_sendallwos(fd, buf, WBUFW(buf,2));
+				}
+				// Transmitting the maps of the other map-servers to the new map-server
+				for(x = 0; x < ARRAYLENGTH(server); x++) {
+					if (server[x].fd > 0 && x != id) {
+						WFIFOHEAD(fd,10 +4*ARRAYLENGTH(server[x].map));
+						WFIFOW(fd,0) = 0x2b04;
+						WFIFOL(fd,4) = htonl(server[x].ip);
+						WFIFOW(fd,8) = htons(server[x].port);
+						j = 0;
+						for(i = 0; i < ARRAYLENGTH(server[x].map); i++)
+							if (server[x].map[i])
+								WFIFOW(fd,10+(j++)*4) = server[x].map[i];
+						if (j > 0) {
+							WFIFOW(fd,2) = j * 4 + 10;
+							WFIFOSET(fd,WFIFOW(fd,2));
+						}
 					}
 				}
-			}
-			}
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-		break;
+				}
+				RFIFOSKIP(fd,RFIFOW(fd,2));
+			break;
 
-		case 0x2afc: //Packet command is now used for sc_data request. [Skotlex]
-			if (RFIFOREST(fd) < 10)
-				return 0;
-		{
-#ifdef ENABLE_SC_SAVING
-			int aid, cid;
-			aid = RFIFOL(fd,2);
-			cid = RFIFOL(fd,6);
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT type, tick, val1, val2, val3, val4 from `%s` WHERE `account_id` = '%d' AND `char_id`='%d'",
-				scdata_db, aid, cid) )
-			{
-				Sql_ShowDebug(sql_handle);
-				break;
-			}
-			if( Sql_NumRows(sql_handle) > 0 )
+			case 0x2afc: //Packet command is now used for sc_data request. [Skotlex]
+				if (RFIFOREST(fd) < 10)
+					return 0;
 			{
-				struct status_change_data scdata;
-				int count;
-				char* data;
-
-				WFIFOHEAD(fd,14+50*sizeof(struct status_change_data));
-				WFIFOW(fd,0) = 0x2b1d;
-				WFIFOL(fd,4) = aid;
-				WFIFOL(fd,8) = cid;
-				for( count = 0; count < 50 && SQL_SUCCESS == Sql_NextRow(sql_handle); ++count )
+	#ifdef ENABLE_SC_SAVING
+				int aid, cid;
+				aid = RFIFOL(fd,2);
+				cid = RFIFOL(fd,6);
+				if( SQL_ERROR == Sql_Query(sql_handle, "SELECT type, tick, val1, val2, val3, val4 from `%s` WHERE `account_id` = '%d' AND `char_id`='%d'",
+					scdata_db, aid, cid) )
 				{
-					Sql_GetData(sql_handle, 0, &data, NULL); scdata.type = atoi(data);
-					Sql_GetData(sql_handle, 1, &data, NULL); scdata.tick = atoi(data);
-					Sql_GetData(sql_handle, 2, &data, NULL); scdata.val1 = atoi(data);
-					Sql_GetData(sql_handle, 3, &data, NULL); scdata.val2 = atoi(data);
-					Sql_GetData(sql_handle, 4, &data, NULL); scdata.val3 = atoi(data);
-					Sql_GetData(sql_handle, 5, &data, NULL); scdata.val4 = atoi(data);
-					memcpy(WFIFOP(fd, 14+count*sizeof(struct status_change_data)), &scdata, sizeof(struct status_change_data));
+					Sql_ShowDebug(sql_handle);
+					break;
 				}
-				if (count >= 50)
-					ShowWarning("Too many status changes for %d:%d, some of them were not loaded.\n", aid, cid);
-				if (count > 0)
+				if( Sql_NumRows(sql_handle) > 0 )
 				{
-					WFIFOW(fd,2) = 14 + count*sizeof(struct status_change_data);
-					WFIFOW(fd,12) = count;
-					WFIFOSET(fd,WFIFOW(fd,2));
+					struct status_change_data scdata;
+					int count;
+					char* data;
+
+					WFIFOHEAD(fd,14+50*sizeof(struct status_change_data));
+					WFIFOW(fd,0) = 0x2b1d;
+					WFIFOL(fd,4) = aid;
+					WFIFOL(fd,8) = cid;
+					for( count = 0; count < 50 && SQL_SUCCESS == Sql_NextRow(sql_handle); ++count )
+					{
+						Sql_GetData(sql_handle, 0, &data, NULL); scdata.type = atoi(data);
+						Sql_GetData(sql_handle, 1, &data, NULL); scdata.tick = atoi(data);
+						Sql_GetData(sql_handle, 2, &data, NULL); scdata.val1 = atoi(data);
+						Sql_GetData(sql_handle, 3, &data, NULL); scdata.val2 = atoi(data);
+						Sql_GetData(sql_handle, 4, &data, NULL); scdata.val3 = atoi(data);
+						Sql_GetData(sql_handle, 5, &data, NULL); scdata.val4 = atoi(data);
+						memcpy(WFIFOP(fd, 14+count*sizeof(struct status_change_data)), &scdata, sizeof(struct status_change_data));
+					}
+					if (count >= 50)
+						ShowWarning("Too many status changes for %d:%d, some of them were not loaded.\n", aid, cid);
+					if (count > 0)
+					{
+						WFIFOW(fd,2) = 14 + count*sizeof(struct status_change_data);
+						WFIFOW(fd,12) = count;
+						WFIFOSET(fd,WFIFOW(fd,2));
 
-					//Clear the data once loaded.
-					if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, aid, cid) )
-						Sql_ShowDebug(sql_handle);
+						//Clear the data once loaded.
+						if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, aid, cid) )
+							Sql_ShowDebug(sql_handle);
+					}
 				}
+				Sql_FreeResult(sql_handle);
+	#endif
+				RFIFOSKIP(fd, 10);
 			}
-			Sql_FreeResult(sql_handle);
-#endif
-			RFIFOSKIP(fd, 10);
-		}
-		break;
+			break;
 
-		case 0x2afe: //set MAP user count
-			if (RFIFOREST(fd) < 4)
-				return 0;
-			if (RFIFOW(fd,2) != server[id].users) {
-				server[id].users = RFIFOW(fd,2);
-				ShowInfo("User Count: %d (Server: %d)\n", server[id].users, id);
+			case 0x2afe: //set MAP user count
+				if (RFIFOREST(fd) < 4)
+					return 0;
+				if (RFIFOW(fd,2) != server[id].users) {
+					server[id].users = RFIFOW(fd,2);
+					ShowInfo("User Count: %d (Server: %d)\n", server[id].users, id);
+				}
+				RFIFOSKIP(fd, 4);
+				break;
+
+			case 0x2aff: //set MAP users
+				if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2))
+					return 0;
+			{
+				//TODO: When data mismatches memory, update guild/party online/offline states.
+				int aid, cid;
+				struct online_char_data* character;
+
+				server[id].users = RFIFOW(fd,4);
+				online_char_db->foreach(online_char_db,char_db_setoffline,id); //Set all chars from this server as 'unknown'
+				for(i = 0; i < server[id].users; i++) {
+					aid = RFIFOL(fd,6+i*8);
+					cid = RFIFOL(fd,6+i*8+4);
+					character = idb_ensure(online_char_db, aid, create_online_char_data);
+					if( character->server > -1 && character->server != id )
+					{
+						ShowNotice("Set map user: Character (%d:%d) marked on map server %d, but map server %d claims to have (%d:%d) online!\n",
+							character->account_id, character->char_id, character->server, id, aid, cid);
+						mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
+					}
+					character->server = id;
+					character->char_id = cid;
+				}
+				//If any chars remain in -2, they will be cleaned in the cleanup timer.
+				RFIFOSKIP(fd,RFIFOW(fd,2));
 			}
-			RFIFOSKIP(fd, 4);
 			break;
 
-		case 0x2aff: //set MAP users
-			if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-		{
-			//TODO: When data mismatches memory, update guild/party online/offline states.
-			int aid, cid;
-			struct online_char_data* character;
-
-			server[id].users = RFIFOW(fd,4);
-			online_char_db->foreach(online_char_db,char_db_setoffline,id); //Set all chars from this server as 'unknown'
-			for(i = 0; i < server[id].users; i++) {
-				aid = RFIFOL(fd,6+i*8);
-				cid = RFIFOL(fd,6+i*8+4);
-				character = idb_ensure(online_char_db, aid, create_online_char_data);
-				if( character->server > -1 && character->server != id )
+			case 0x2b01: // Receive character data from map-server for saving
+				if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+					return 0;
+			{
+				int aid = RFIFOL(fd,4), cid = RFIFOL(fd,8), size = RFIFOW(fd,2);
+				struct online_char_data* character;
+
+				if (size - 13 != sizeof(struct mmo_charstatus))
 				{
-					ShowNotice("Set map user: Character (%d:%d) marked on map server %d, but map server %d claims to have (%d:%d) online!\n",
-						character->account_id, character->char_id, character->server, id, aid, cid);
-					mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
+					ShowError("parse_from_map (save-char): Size mismatch! %d != %d\n", size-13, sizeof(struct mmo_charstatus));
+					RFIFOSKIP(fd,size);
+					break;
+				}
+				//Check account only if this ain't final save. Final-save goes through because of the char-map reconnect
+				if (RFIFOB(fd,12) || (
+					(character = (struct online_char_data*)idb_get(online_char_db, aid)) != NULL &&
+					character->char_id == cid))
+				{
+					struct mmo_charstatus char_dat;
+					memcpy(&char_dat, RFIFOP(fd,13), sizeof(struct mmo_charstatus));
+					mmo_char_tosql(cid, &char_dat);
+				} else {	//This may be valid on char-server reconnection, when re-sending characters that already logged off.
+					ShowError("parse_from_map (save-char): Received data for non-existant/offline character (%d:%d).\n", aid, cid);
+					set_char_online(id, cid, aid);
 				}
-				character->server = id;
-				character->char_id = cid;
-			}
-			//If any chars remain in -2, they will be cleaned in the cleanup timer.
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-		}
-		break;
-
-		case 0x2b01: // Receive character data from map-server for saving
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-		{
-			int aid = RFIFOL(fd,4), cid = RFIFOL(fd,8), size = RFIFOW(fd,2);
-			struct online_char_data* character;
 
-			if (size - 13 != sizeof(struct mmo_charstatus))
-			{
-				ShowError("parse_from_map (save-char): Size mismatch! %d != %d\n", size-13, sizeof(struct mmo_charstatus));
+				if (RFIFOB(fd,12))
+				{	//Flag, set character offline after saving. [Skotlex]
+					set_char_offline(cid, aid);
+					WFIFOHEAD(fd,10);
+					WFIFOW(fd,0) = 0x2b21; //Save ack only needed on final save.
+					WFIFOL(fd,2) = aid;
+					WFIFOL(fd,6) = cid;
+					WFIFOSET(fd,10);
+				}
 				RFIFOSKIP(fd,size);
-				break;
 			}
-			//Check account only if this ain't final save. Final-save goes through because of the char-map reconnect
-			if (RFIFOB(fd,12) || (
-				(character = (struct online_char_data*)idb_get(online_char_db, aid)) != NULL &&
-				character->char_id == cid))
+			break;
+
+			case 0x2b02: // req char selection
+				if( RFIFOREST(fd) < 18 )
+					return 0;
 			{
-				struct mmo_charstatus char_dat;
-				memcpy(&char_dat, RFIFOP(fd,13), sizeof(struct mmo_charstatus));
-				mmo_char_tosql(cid, &char_dat);
-			} else {	//This may be valid on char-server reconnection, when re-sending characters that already logged off.
-				ShowError("parse_from_map (save-char): Received data for non-existant/offline character (%d:%d).\n", aid, cid);
-				set_char_online(id, cid, aid);
-			}
+				int account_id = RFIFOL(fd,2);
+				uint32 login_id1 = RFIFOL(fd,6);
+				uint32 login_id2 = RFIFOL(fd,10);
+				uint32 ip = RFIFOL(fd,14);
+				RFIFOSKIP(fd,18);
 
-			if (RFIFOB(fd,12))
-			{	//Flag, set character offline after saving. [Skotlex]
-				set_char_offline(cid, aid);
-				WFIFOHEAD(fd,10);
-				WFIFOW(fd,0) = 0x2b21; //Save ack only needed on final save.
-				WFIFOL(fd,2) = aid;
-				WFIFOL(fd,6) = cid;
-				WFIFOSET(fd,10);
+				if( runflag != CHARSERVER_ST_RUNNING )
+				{
+					WFIFOHEAD(fd,7);
+					WFIFOW(fd,0) = 0x2b03;
+					WFIFOL(fd,2) = account_id;
+					WFIFOB(fd,6) = 0;// not ok
+					WFIFOSET(fd,7);
+				}
+				else
+				{
+					struct auth_node* node;
+				
+					// create temporary auth entry
+					CREATE(node, struct auth_node, 1);
+					node->account_id = account_id;
+					node->char_id = 0;
+					node->login_id1 = login_id1;
+					node->login_id2 = login_id2;
+					//node->sex = 0;
+					node->ip = ntohl(ip);
+					//node->expiration_time = 0; // unlimited/unknown time by default (not display in map-server)
+					//node->gmlevel = 0;
+					idb_put(auth_db, account_id, node);
+
+					//Set char to "@ char select" in online db [Kevin]
+					set_char_charselect(account_id);
+
+					WFIFOHEAD(fd,7);
+					WFIFOW(fd,0) = 0x2b03;
+					WFIFOL(fd,2) = account_id;
+					WFIFOB(fd,6) = 1;// ok
+					WFIFOSET(fd,7);
+				}
 			}
-			RFIFOSKIP(fd,size);
-		}
-		break;
-
-		case 0x2b02: // req char selection
-			if( RFIFOREST(fd) < 18 )
-				return 0;
-		{
-			int account_id = RFIFOL(fd,2);
-			uint32 login_id1 = RFIFOL(fd,6);
-			uint32 login_id2 = RFIFOL(fd,10);
-			uint32 ip = RFIFOL(fd,14);
-			RFIFOSKIP(fd,18);
+			break;
 
-			if( runflag != CHARSERVER_ST_RUNNING )
-			{
-				WFIFOHEAD(fd,7);
-				WFIFOW(fd,0) = 0x2b03;
-				WFIFOL(fd,2) = account_id;
-				WFIFOB(fd,6) = 0;// not ok
-				WFIFOSET(fd,7);
-			}
-			else
+			case 0x2b05: // request "change map server"
+				if (RFIFOREST(fd) < 39)
+					return 0;
 			{
-				struct auth_node* node;
-			
-				// create temporary auth entry
-				CREATE(node, struct auth_node, 1);
-				node->account_id = account_id;
-				node->char_id = 0;
-				node->login_id1 = login_id1;
-				node->login_id2 = login_id2;
-				//node->sex = 0;
-				node->ip = ntohl(ip);
-				//node->expiration_time = 0; // unlimited/unknown time by default (not display in map-server)
-				//node->gmlevel = 0;
-				idb_put(auth_db, account_id, node);
-
-				//Set char to "@ char select" in online db [Kevin]
-				set_char_charselect(account_id);
-
-				WFIFOHEAD(fd,7);
-				WFIFOW(fd,0) = 0x2b03;
-				WFIFOL(fd,2) = account_id;
-				WFIFOB(fd,6) = 1;// ok
-				WFIFOSET(fd,7);
-			}
-		}
-		break;
+				int map_id, map_fd = -1;
+				struct mmo_charstatus* char_data;
+				struct mmo_charstatus char_dat;
 
-		case 0x2b05: // request "change map server"
-			if (RFIFOREST(fd) < 39)
-				return 0;
-		{
-			int map_id, map_fd = -1;
-			struct mmo_charstatus* char_data;
-			struct mmo_charstatus char_dat;
-
-			map_id = search_mapserver(RFIFOW(fd,18), ntohl(RFIFOL(fd,24)), ntohs(RFIFOW(fd,28))); //Locate mapserver by ip and port.
-			if (map_id >= 0)
-				map_fd = server[map_id].fd;
-			//Char should just had been saved before this packet, so this should be safe. [Skotlex]
-			char_data = (struct mmo_charstatus*)uidb_get(char_db_,RFIFOL(fd,14));
-			if (char_data == NULL) {	//Really shouldn't happen.
-				mmo_char_fromsql(RFIFOL(fd,14), &char_dat, true);
+				map_id = search_mapserver(RFIFOW(fd,18), ntohl(RFIFOL(fd,24)), ntohs(RFIFOW(fd,28))); //Locate mapserver by ip and port.
+				if (map_id >= 0)
+					map_fd = server[map_id].fd;
+				//Char should just had been saved before this packet, so this should be safe. [Skotlex]
 				char_data = (struct mmo_charstatus*)uidb_get(char_db_,RFIFOL(fd,14));
+				if (char_data == NULL) {	//Really shouldn't happen.
+					mmo_char_fromsql(RFIFOL(fd,14), &char_dat, true);
+					char_data = (struct mmo_charstatus*)uidb_get(char_db_,RFIFOL(fd,14));
+				}
+
+				if( runflag == CHARSERVER_ST_RUNNING &&
+					session_isActive(map_fd) &&
+					char_data )
+				{	//Send the map server the auth of this player.
+					struct online_char_data* data;
+					struct auth_node* node;
+
+					//Update the "last map" as this is where the player must be spawned on the new map server.
+					char_data->last_point.map = RFIFOW(fd,18);
+					char_data->last_point.x = RFIFOW(fd,20);
+					char_data->last_point.y = RFIFOW(fd,22);
+					char_data->sex = RFIFOB(fd,30);
+
+					// create temporary auth entry
+					CREATE(node, struct auth_node, 1);
+					node->account_id = RFIFOL(fd,2);
+					node->char_id = RFIFOL(fd,14);
+					node->login_id1 = RFIFOL(fd,6);
+					node->login_id2 = RFIFOL(fd,10);
+					node->sex = RFIFOB(fd,30);
+					node->expiration_time = 0; // FIXME (this thing isn't really supported we could as well purge it instead of fixing)
+					node->ip = ntohl(RFIFOL(fd,31));
+					node->group_id = RFIFOL(fd,35);
+					node->changing_mapservers = 1;
+					idb_put(auth_db, RFIFOL(fd,2), node);
+
+					data = idb_ensure(online_char_db, RFIFOL(fd,2), create_online_char_data);
+					data->char_id = char_data->char_id;
+					data->server = map_id; //Update server where char is.
+
+					//Reply with an ack.
+					WFIFOHEAD(fd,30);
+					WFIFOW(fd,0) = 0x2b06;
+					memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
+					WFIFOSET(fd,30);
+				} else { //Reply with nak
+					WFIFOHEAD(fd,30);
+					WFIFOW(fd,0) = 0x2b06;
+					memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
+					WFIFOL(fd,6) = 0; //Set login1 to 0.
+					WFIFOSET(fd,30);
+				}
+				RFIFOSKIP(fd,39);
 			}
+			break;
 
-			if( runflag == CHARSERVER_ST_RUNNING &&
-				session_isActive(map_fd) &&
-				char_data )
-			{	//Send the map server the auth of this player.
-				struct online_char_data* data;
-				struct auth_node* node;
+			case 0x2b07: // Remove RFIFOL(fd,6) (friend_id) from RFIFOL(fd,2) (char_id) friend list [Ind]
+				if (RFIFOREST(fd) < 10)
+					return 0;
+				{
+					int char_id, friend_id;
+					char_id = RFIFOL(fd,2);
+					friend_id = RFIFOL(fd,6);
+					if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d' AND `friend_id`='%d' LIMIT 1",
+						friend_db, char_id, friend_id) ) {
+						Sql_ShowDebug(sql_handle);
+						break;
+					}
+					RFIFOSKIP(fd,10);
+				}
+			break;
 
-				//Update the "last map" as this is where the player must be spawned on the new map server.
-				char_data->last_point.map = RFIFOW(fd,18);
-				char_data->last_point.x = RFIFOW(fd,20);
-				char_data->last_point.y = RFIFOW(fd,22);
-				char_data->sex = RFIFOB(fd,30);
+			case 0x2b08: // char name request
+				if (RFIFOREST(fd) < 6)
+					return 0;
 
-				// create temporary auth entry
-				CREATE(node, struct auth_node, 1);
-				node->account_id = RFIFOL(fd,2);
-				node->char_id = RFIFOL(fd,14);
-				node->login_id1 = RFIFOL(fd,6);
-				node->login_id2 = RFIFOL(fd,10);
-				node->sex = RFIFOB(fd,30);
-				node->expiration_time = 0; // FIXME (this thing isn't really supported we could as well purge it instead of fixing)
-				node->ip = ntohl(RFIFOL(fd,31));
-				node->group_id = RFIFOL(fd,35);
-				node->changing_mapservers = 1;
-				idb_put(auth_db, RFIFOL(fd,2), node);
-
-				data = idb_ensure(online_char_db, RFIFOL(fd,2), create_online_char_data);
-				data->char_id = char_data->char_id;
-				data->server = map_id; //Update server where char is.
-
-				//Reply with an ack.
 				WFIFOHEAD(fd,30);
-				WFIFOW(fd,0) = 0x2b06;
-				memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
+				WFIFOW(fd,0) = 0x2b09;
+				WFIFOL(fd,2) = RFIFOL(fd,2);
+				char_loadName((int)RFIFOL(fd,2), (char*)WFIFOP(fd,6));
 				WFIFOSET(fd,30);
-			} else { //Reply with nak
-				WFIFOHEAD(fd,30);
-				WFIFOW(fd,0) = 0x2b06;
-				memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
-				WFIFOL(fd,6) = 0; //Set login1 to 0.
-				WFIFOSET(fd,30);
-			}
-			RFIFOSKIP(fd,39);
-		}
-		break;
 
-		case 0x2b07: // Remove RFIFOL(fd,6) (friend_id) from RFIFOL(fd,2) (char_id) friend list [Ind]
-			if (RFIFOREST(fd) < 10)
-				return 0;
+				RFIFOSKIP(fd,6);
+			break;
+
+			case 0x2b0c: // Map server send information to change an email of an account -> login-server
+				if (RFIFOREST(fd) < 86)
+					return 0;
+				if (login_fd > 0) { // don't send request if no login-server
+					WFIFOHEAD(login_fd,86);
+					memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0),86); // 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B
+					WFIFOW(login_fd,0) = 0x2722;
+					WFIFOSET(login_fd,86);
+				}
+				RFIFOSKIP(fd, 86);
+			break;
+
+			case 0x2b0e: // Request from map-server to change an account's status (will just be forwarded to login server)
+				if (RFIFOREST(fd) < 44)
+					return 0;
 			{
-				int char_id, friend_id;
-				char_id = RFIFOL(fd,2);
-				friend_id = RFIFOL(fd,6);
-				if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d' AND `friend_id`='%d' LIMIT 1",
-					friend_db, char_id, friend_id) ) {
+				int result = 0; // 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
+				char esc_name[NAME_LENGTH*2+1];
+
+				int acc = RFIFOL(fd,2); // account_id of who ask (-1 if server itself made this request)
+				const char* name = (char*)RFIFOP(fd,6); // name of the target character
+				int type = RFIFOW(fd,30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban
+				short year = RFIFOW(fd,32);
+				short month = RFIFOW(fd,34);
+				short day = RFIFOW(fd,36);
+				short hour = RFIFOW(fd,38);
+				short minute = RFIFOW(fd,40);
+				short second = RFIFOW(fd,42);
+				RFIFOSKIP(fd,44);
+
+				Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+				if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`name` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
+					Sql_ShowDebug(sql_handle);
+				else
+				if( Sql_NumRows(sql_handle) == 0 )
+				{
+					result = 1; // 1-player not found
+				}
+				else
+				if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
 					Sql_ShowDebug(sql_handle);
+					//FIXME: set proper result value?
+				else
+				{
+					char name[NAME_LENGTH];
+					int account_id;
+					char* data;
+
+					Sql_GetData(sql_handle, 0, &data, NULL); account_id = atoi(data);
+					Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(name, data, sizeof(name));
+
+					if( login_fd <= 0 )
+						result = 3; // 3-login-server offline
+					//FIXME: need to move this check to login server [ultramage]
+	//				else
+	//				if( acc != -1 && isGM(acc) < isGM(account_id) )
+	//					result = 2; // 2-gm level too low
+					else
+					switch( type ) {
+					case 1: // block
+							WFIFOHEAD(login_fd,10);
+							WFIFOW(login_fd,0) = 0x2724;
+							WFIFOL(login_fd,2) = account_id;
+							WFIFOL(login_fd,6) = 5; // new account status
+							WFIFOSET(login_fd,10);
+					break;
+					case 2: // ban
+							WFIFOHEAD(login_fd,18);
+							WFIFOW(login_fd, 0) = 0x2725;
+							WFIFOL(login_fd, 2) = account_id;
+							WFIFOW(login_fd, 6) = year;
+							WFIFOW(login_fd, 8) = month;
+							WFIFOW(login_fd,10) = day;
+							WFIFOW(login_fd,12) = hour;
+							WFIFOW(login_fd,14) = minute;
+							WFIFOW(login_fd,16) = second;
+							WFIFOSET(login_fd,18);
+					break;
+					case 3: // unblock
+							WFIFOHEAD(login_fd,10);
+							WFIFOW(login_fd,0) = 0x2724;
+							WFIFOL(login_fd,2) = account_id;
+							WFIFOL(login_fd,6) = 0; // new account status
+							WFIFOSET(login_fd,10);
+					break;
+					case 4: // unban
+							WFIFOHEAD(login_fd,6);
+							WFIFOW(login_fd,0) = 0x272a;
+							WFIFOL(login_fd,2) = account_id;
+							WFIFOSET(login_fd,6);
 					break;
+					case 5: // changesex
+							WFIFOHEAD(login_fd,6);
+							WFIFOW(login_fd,0) = 0x2727;
+							WFIFOL(login_fd,2) = account_id;
+							WFIFOSET(login_fd,6);
+					break;
+					}
 				}
-				RFIFOSKIP(fd,10);
-			}
-		break;
 
-		case 0x2b08: // char name request
-			if (RFIFOREST(fd) < 6)
-				return 0;
-
-			WFIFOHEAD(fd,30);
-			WFIFOW(fd,0) = 0x2b09;
-			WFIFOL(fd,2) = RFIFOL(fd,2);
-			char_loadName((int)RFIFOL(fd,2), (char*)WFIFOP(fd,6));
-			WFIFOSET(fd,30);
-
-			RFIFOSKIP(fd,6);
-		break;
+				Sql_FreeResult(sql_handle);
 
-		case 0x2b0c: // Map server send information to change an email of an account -> login-server
-			if (RFIFOREST(fd) < 86)
-				return 0;
-			if (login_fd > 0) { // don't send request if no login-server
-				WFIFOHEAD(login_fd,86);
-				memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0),86); // 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B
-				WFIFOW(login_fd,0) = 0x2722;
-				WFIFOSET(login_fd,86);
+				// send answer if a player ask, not if the server ask
+				if( acc != -1 && type != 5) { // Don't send answer for changesex
+					WFIFOHEAD(fd,34);
+					WFIFOW(fd, 0) = 0x2b0f;
+					WFIFOL(fd, 2) = acc;
+					safestrncpy((char*)WFIFOP(fd,6), name, NAME_LENGTH);
+					WFIFOW(fd,30) = type;
+					WFIFOW(fd,32) = result;
+					WFIFOSET(fd,34);
+				}
 			}
-			RFIFOSKIP(fd, 86);
-		break;
+			break;
 
-		case 0x2b0e: // Request from map-server to change an account's status (will just be forwarded to login server)
-			if (RFIFOREST(fd) < 44)
-				return 0;
-		{
-			int result = 0; // 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
-			char esc_name[NAME_LENGTH*2+1];
-
-			int acc = RFIFOL(fd,2); // account_id of who ask (-1 if server itself made this request)
-			const char* name = (char*)RFIFOP(fd,6); // name of the target character
-			int type = RFIFOW(fd,30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban
-			short year = RFIFOW(fd,32);
-			short month = RFIFOW(fd,34);
-			short day = RFIFOW(fd,36);
-			short hour = RFIFOW(fd,38);
-			short minute = RFIFOW(fd,40);
-			short second = RFIFOW(fd,42);
-			RFIFOSKIP(fd,44);
-
-			Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`name` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
-				Sql_ShowDebug(sql_handle);
-			else
-			if( Sql_NumRows(sql_handle) == 0 )
-			{
-				result = 1; // 1-player not found
-			}
-			else
-			if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
-				Sql_ShowDebug(sql_handle);
-				//FIXME: set proper result value?
-			else
+			case 0x2b10: // Update and send fame ranking list
+				if (RFIFOREST(fd) < 11)
+					return 0;
 			{
-				char name[NAME_LENGTH];
-				int account_id;
-				char* data;
+				int cid = RFIFOL(fd, 2);
+				int fame = RFIFOL(fd, 6);
+				char type = RFIFOB(fd, 10);
+				int size;
+				struct fame_list* list;
+				int player_pos;
+				int fame_pos;
+
+				switch(type)
+				{
+					case 1:  size = fame_list_size_smith;   list = smith_fame_list;   break;
+					case 2:  size = fame_list_size_chemist; list = chemist_fame_list; break;
+					case 3:  size = fame_list_size_taekwon; list = taekwon_fame_list; break;
+					default: size = 0;                      list = NULL;              break;
+				}
 
-				Sql_GetData(sql_handle, 0, &data, NULL); account_id = atoi(data);
-				Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(name, data, sizeof(name));
+				ARR_FIND(0, size, player_pos, list[player_pos].id == cid);// position of the player
+				ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);// where the player should be
 
-				if( login_fd <= 0 )
-					result = 3; // 3-login-server offline
-				//FIXME: need to move this check to login server [ultramage]
-//				else
-//				if( acc != -1 && isGM(acc) < isGM(account_id) )
-//					result = 2; // 2-gm level too low
+				if( player_pos == size && fame_pos == size )
+					;// not on list and not enough fame to get on it
+				else if( fame_pos == player_pos )
+				{// same position
+					list[player_pos].fame = fame;
+					char_update_fame_list(type, player_pos, fame);
+				}
 				else
-				switch( type ) {
-				case 1: // block
-						WFIFOHEAD(login_fd,10);
-						WFIFOW(login_fd,0) = 0x2724;
-						WFIFOL(login_fd,2) = account_id;
-						WFIFOL(login_fd,6) = 5; // new account status
-						WFIFOSET(login_fd,10);
-				break;
-				case 2: // ban
-						WFIFOHEAD(login_fd,18);
-						WFIFOW(login_fd, 0) = 0x2725;
-						WFIFOL(login_fd, 2) = account_id;
-						WFIFOW(login_fd, 6) = year;
-						WFIFOW(login_fd, 8) = month;
-						WFIFOW(login_fd,10) = day;
-						WFIFOW(login_fd,12) = hour;
-						WFIFOW(login_fd,14) = minute;
-						WFIFOW(login_fd,16) = second;
-						WFIFOSET(login_fd,18);
-				break;
-				case 3: // unblock
-						WFIFOHEAD(login_fd,10);
-						WFIFOW(login_fd,0) = 0x2724;
-						WFIFOL(login_fd,2) = account_id;
-						WFIFOL(login_fd,6) = 0; // new account status
-						WFIFOSET(login_fd,10);
-				break;
-				case 4: // unban
-						WFIFOHEAD(login_fd,6);
-						WFIFOW(login_fd,0) = 0x272a;
-						WFIFOL(login_fd,2) = account_id;
-						WFIFOSET(login_fd,6);
-				break;
-				case 5: // changesex
-						WFIFOHEAD(login_fd,6);
-						WFIFOW(login_fd,0) = 0x2727;
-						WFIFOL(login_fd,2) = account_id;
-						WFIFOSET(login_fd,6);
-				break;
+				{// move in the list
+					if( player_pos == size )
+					{// new ranker - not in the list
+						ARR_MOVE(size - 1, fame_pos, list, struct fame_list);
+						list[fame_pos].id = cid;
+						list[fame_pos].fame = fame;
+						char_loadName(cid, list[fame_pos].name);
+					}
+					else
+					{// already in the list
+						if( fame_pos == size )
+							--fame_pos;// move to the end of the list
+						ARR_MOVE(player_pos, fame_pos, list, struct fame_list);
+						list[fame_pos].fame = fame;
+					}
+					char_send_fame_list(-1);
 				}
+
+				RFIFOSKIP(fd,11);
 			}
+			break;
 
-			Sql_FreeResult(sql_handle);
+			// Divorce chars
+			case 0x2b11:
+				if( RFIFOREST(fd) < 10 )
+					return 0;
 
-			// send answer if a player ask, not if the server ask
-			if( acc != -1 && type != 5) { // Don't send answer for changesex
-				WFIFOHEAD(fd,34);
-				WFIFOW(fd, 0) = 0x2b0f;
-				WFIFOL(fd, 2) = acc;
-				safestrncpy((char*)WFIFOP(fd,6), name, NAME_LENGTH);
-				WFIFOW(fd,30) = type;
-				WFIFOW(fd,32) = result;
-				WFIFOSET(fd,34);
-			}
-		}
-		break;
+				divorce_char_sql(RFIFOL(fd,2), RFIFOL(fd,6));
+				RFIFOSKIP(fd,10);
+			break;
 
-		case 0x2b10: // Update and send fame ranking list
-			if (RFIFOREST(fd) < 11)
-				return 0;
-		{
-			int cid = RFIFOL(fd, 2);
-			int fame = RFIFOL(fd, 6);
-			char type = RFIFOB(fd, 10);
-			int size;
-			struct fame_list* list;
-			int player_pos;
-			int fame_pos;
-
-			switch(type)
+			case 0x2b16: // Receive rates [Wizputer]
+				if( RFIFOREST(fd) < 14 )
+					return 0;
 			{
-				case 1:  size = fame_list_size_smith;   list = smith_fame_list;   break;
-				case 2:  size = fame_list_size_chemist; list = chemist_fame_list; break;
-				case 3:  size = fame_list_size_taekwon; list = taekwon_fame_list; break;
-				default: size = 0;                      list = NULL;              break;
-			}
+				char esc_server_name[sizeof(server_name)*2+1];
 
-			ARR_FIND(0, size, player_pos, list[player_pos].id == cid);// position of the player
-			ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);// where the player should be
+				Sql_EscapeString(sql_handle, esc_server_name, server_name);
 
-			if( player_pos == size && fame_pos == size )
-				;// not on list and not enough fame to get on it
-			else if( fame_pos == player_pos )
-			{// same position
-				list[player_pos].fame = fame;
-				char_update_fame_list(type, player_pos, fame);
-			}
-			else
-			{// move in the list
-				if( player_pos == size )
-				{// new ranker - not in the list
-					ARR_MOVE(size - 1, fame_pos, list, struct fame_list);
-					list[fame_pos].id = cid;
-					list[fame_pos].fame = fame;
-					char_loadName(cid, list[fame_pos].name);
-				}
-				else
-				{// already in the list
-					if( fame_pos == size )
-						--fame_pos;// move to the end of the list
-					ARR_MOVE(player_pos, fame_pos, list, struct fame_list);
-					list[fame_pos].fame = fame;
-				}
-				char_send_fame_list(-1);
+				if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` SET `index`='%d',`name`='%s',`exp`='%d',`jexp`='%d',`drop`='%d'",
+					ragsrvinfo_db, fd, esc_server_name, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)) )
+					Sql_ShowDebug(sql_handle);
+				RFIFOSKIP(fd,14);
 			}
+			break;
 
-			RFIFOSKIP(fd,11);
-		}
-		break;
-
-		// Divorce chars
-		case 0x2b11:
-			if( RFIFOREST(fd) < 10 )
-				return 0;
-
-			divorce_char_sql(RFIFOL(fd,2), RFIFOL(fd,6));
-			RFIFOSKIP(fd,10);
-		break;
+			case 0x2b17: // Character disconnected set online 0 [Wizputer]
+				if (RFIFOREST(fd) < 6)
+					return 0;
+				set_char_offline(RFIFOL(fd,2),RFIFOL(fd,6));
+				RFIFOSKIP(fd,10);
+			break;
 
-		case 0x2b16: // Receive rates [Wizputer]
-			if( RFIFOREST(fd) < 14 )
-				return 0;
-		{
-			char esc_server_name[sizeof(server_name)*2+1];
+			case 0x2b18: // Reset all chars to offline [Wizputer]
+				set_all_offline(id);
+				RFIFOSKIP(fd,2);
+			break;
 
-			Sql_EscapeString(sql_handle, esc_server_name, server_name);
+			case 0x2b19: // Character set online [Wizputer]
+				if (RFIFOREST(fd) < 10)
+					return 0;
+				set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6));
+				RFIFOSKIP(fd,10);
+			break;
 
-			if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` SET `index`='%d',`name`='%s',`exp`='%d',`jexp`='%d',`drop`='%d'",
-				ragsrvinfo_db, fd, esc_server_name, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)) )
-				Sql_ShowDebug(sql_handle);
-			RFIFOSKIP(fd,14);
-		}
-		break;
+			case 0x2b1a: // Build and send fame ranking lists [DracoRPG]
+				if (RFIFOREST(fd) < 2)
+					return 0;
+				char_read_fame_list();
+				char_send_fame_list(-1);
+				RFIFOSKIP(fd,2);
+			break;
 
-		case 0x2b17: // Character disconnected set online 0 [Wizputer]
-			if (RFIFOREST(fd) < 6)
-				return 0;
-			set_char_offline(RFIFOL(fd,2),RFIFOL(fd,6));
-			RFIFOSKIP(fd,10);
-		break;
+			case 0x2b1c: //Request to save status change data. [Skotlex]
+				if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+					return 0;
+			{
+	#ifdef ENABLE_SC_SAVING
+				int count, aid, cid;
 
-		case 0x2b18: // Reset all chars to offline [Wizputer]
-			set_all_offline(id);
-			RFIFOSKIP(fd,2);
-		break;
+				aid = RFIFOL(fd, 4);
+				cid = RFIFOL(fd, 8);
+				count = RFIFOW(fd, 12);
 
-		case 0x2b19: // Character set online [Wizputer]
-			if (RFIFOREST(fd) < 10)
-				return 0;
-			set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6));
-			RFIFOSKIP(fd,10);
-		break;
+				if( count > 0 )
+				{
+					struct status_change_data data;
+					StringBuf buf;
+					int i;
 
-		case 0x2b1a: // Build and send fame ranking lists [DracoRPG]
-			if (RFIFOREST(fd) < 2)
-				return 0;
-			char_read_fame_list();
-			char_send_fame_list(-1);
-			RFIFOSKIP(fd,2);
-		break;
+					StringBuf_Init(&buf);
+					StringBuf_Printf(&buf, "INSERT INTO `%s` (`account_id`, `char_id`, `type`, `tick`, `val1`, `val2`, `val3`, `val4`) VALUES ", scdata_db);
+					for( i = 0; i < count; ++i )
+					{
+						memcpy (&data, RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data));
+						if( i > 0 )
+							StringBuf_AppendStr(&buf, ", ");
+						StringBuf_Printf(&buf, "('%d','%d','%hu','%d','%d','%d','%d','%d')", aid, cid,
+							data.type, data.tick, data.val1, data.val2, data.val3, data.val4);
+					}
+					if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+						Sql_ShowDebug(sql_handle);
+					StringBuf_Destroy(&buf);
+				}
+	#endif
+				RFIFOSKIP(fd, RFIFOW(fd, 2));
+			}
+			break;
 
-		case 0x2b1c: //Request to save status change data. [Skotlex]
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-		{
-#ifdef ENABLE_SC_SAVING
-			int count, aid, cid;
+			case 0x2b23: // map-server alive packet
+				WFIFOHEAD(fd,2);
+				WFIFOW(fd,0) = 0x2b24;
+				WFIFOSET(fd,2);
+				RFIFOSKIP(fd,2);
+			break;
 
-			aid = RFIFOL(fd, 4);
-			cid = RFIFOL(fd, 8);
-			count = RFIFOW(fd, 12);
+			case 0x2b26: // auth request from map-server
+				if (RFIFOREST(fd) < 19)
+					return 0;
 
-			if( count > 0 )
 			{
-				struct status_change_data data;
-				StringBuf buf;
-				int i;
-
-				StringBuf_Init(&buf);
-				StringBuf_Printf(&buf, "INSERT INTO `%s` (`account_id`, `char_id`, `type`, `tick`, `val1`, `val2`, `val3`, `val4`) VALUES ", scdata_db);
-				for( i = 0; i < count; ++i )
-				{
-					memcpy (&data, RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data));
-					if( i > 0 )
-						StringBuf_AppendStr(&buf, ", ");
-					StringBuf_Printf(&buf, "('%d','%d','%hu','%d','%d','%d','%d','%d')", aid, cid,
-						data.type, data.tick, data.val1, data.val2, data.val3, data.val4);
-				}
-				if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
-					Sql_ShowDebug(sql_handle);
-				StringBuf_Destroy(&buf);
-			}
-#endif
-			RFIFOSKIP(fd, RFIFOW(fd, 2));
-		}
-		break;
-
-		case 0x2b23: // map-server alive packet
-			WFIFOHEAD(fd,2);
-			WFIFOW(fd,0) = 0x2b24;
-			WFIFOSET(fd,2);
-			RFIFOSKIP(fd,2);
-		break;
+				int account_id;
+				int char_id;
+				int login_id1;
+				char sex;
+				uint32 ip;
+				struct auth_node* node;
+				struct mmo_charstatus* cd;
+				struct mmo_charstatus char_dat;
 
-		case 0x2b26: // auth request from map-server
-			if (RFIFOREST(fd) < 19)
-				return 0;
+				account_id = RFIFOL(fd,2);
+				char_id    = RFIFOL(fd,6);
+				login_id1  = RFIFOL(fd,10);
+				sex        = RFIFOB(fd,14);
+				ip         = ntohl(RFIFOL(fd,15));
+				RFIFOSKIP(fd,19);
 
-		{
-			int account_id;
-			int char_id;
-			int login_id1;
-			char sex;
-			uint32 ip;
-			struct auth_node* node;
-			struct mmo_charstatus* cd;
-			struct mmo_charstatus char_dat;
-
-			account_id = RFIFOL(fd,2);
-			char_id    = RFIFOL(fd,6);
-			login_id1  = RFIFOL(fd,10);
-			sex        = RFIFOB(fd,14);
-			ip         = ntohl(RFIFOL(fd,15));
-			RFIFOSKIP(fd,19);
-
-			node = (struct auth_node*)idb_get(auth_db, account_id);
-			cd = (struct mmo_charstatus*)uidb_get(char_db_,char_id);
-			if( cd == NULL )
-			{	//Really shouldn't happen.
-				mmo_char_fromsql(char_id, &char_dat, true);
+				node = (struct auth_node*)idb_get(auth_db, account_id);
 				cd = (struct mmo_charstatus*)uidb_get(char_db_,char_id);
+				if( cd == NULL )
+				{	//Really shouldn't happen.
+					mmo_char_fromsql(char_id, &char_dat, true);
+					cd = (struct mmo_charstatus*)uidb_get(char_db_,char_id);
+				}
+				if( runflag == CHARSERVER_ST_RUNNING &&
+					cd != NULL &&
+					node != NULL &&
+					node->account_id == account_id &&
+					node->char_id == char_id &&
+					node->login_id1 == login_id1 &&
+					node->sex == sex /*&&
+					node->ip == ip*/ )
+				{// auth ok
+					cd->sex = sex;
+
+					WFIFOHEAD(fd,25 + sizeof(struct mmo_charstatus));
+					WFIFOW(fd,0) = 0x2afd;
+					WFIFOW(fd,2) = 25 + sizeof(struct mmo_charstatus);
+					WFIFOL(fd,4) = account_id;
+					WFIFOL(fd,8) = node->login_id1;
+					WFIFOL(fd,12) = node->login_id2;
+					WFIFOL(fd,16) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
+					WFIFOL(fd,20) = node->group_id;
+					WFIFOB(fd,24) = node->changing_mapservers;
+					memcpy(WFIFOP(fd,25), cd, sizeof(struct mmo_charstatus));
+					WFIFOSET(fd, WFIFOW(fd,2));
+
+					// only use the auth once and mark user online
+					idb_remove(auth_db, account_id);
+					set_char_online(id, char_id, account_id);
+				}
+				else
+				{// auth failed
+					WFIFOHEAD(fd,19);
+					WFIFOW(fd,0) = 0x2b27;
+					WFIFOL(fd,2) = account_id;
+					WFIFOL(fd,6) = char_id;
+					WFIFOL(fd,10) = login_id1;
+					WFIFOB(fd,14) = sex;
+					WFIFOL(fd,15) = htonl(ip);
+					WFIFOSET(fd,19);
+				}
 			}
-			if( runflag == CHARSERVER_ST_RUNNING &&
-				cd != NULL &&
-				node != NULL &&
-				node->account_id == account_id &&
-				node->char_id == char_id &&
-				node->login_id1 == login_id1 &&
-				node->sex == sex /*&&
-				node->ip == ip*/ )
-			{// auth ok
-				cd->sex = sex;
-
-				WFIFOHEAD(fd,25 + sizeof(struct mmo_charstatus));
-				WFIFOW(fd,0) = 0x2afd;
-				WFIFOW(fd,2) = 25 + sizeof(struct mmo_charstatus);
-				WFIFOL(fd,4) = account_id;
-				WFIFOL(fd,8) = node->login_id1;
-				WFIFOL(fd,12) = node->login_id2;
-				WFIFOL(fd,16) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
-				WFIFOL(fd,20) = node->group_id;
-				WFIFOB(fd,24) = node->changing_mapservers;
-				memcpy(WFIFOP(fd,25), cd, sizeof(struct mmo_charstatus));
-				WFIFOSET(fd, WFIFOW(fd,2));
-
-				// only use the auth once and mark user online
-				idb_remove(auth_db, account_id);
-				set_char_online(id, char_id, account_id);
-			}
-			else
-			{// auth failed
-				WFIFOHEAD(fd,19);
-				WFIFOW(fd,0) = 0x2b27;
-				WFIFOL(fd,2) = account_id;
-				WFIFOL(fd,6) = char_id;
-				WFIFOL(fd,10) = login_id1;
-				WFIFOB(fd,14) = sex;
-				WFIFOL(fd,15) = htonl(ip);
-				WFIFOSET(fd,19);
-			}
-		}
-		break;
+			break;
 
-		case 0x2736: // ip address update
-			if (RFIFOREST(fd) < 6) return 0;
-			server[id].ip = ntohl(RFIFOL(fd, 2));
-			ShowInfo("Updated IP address of map-server #%d to %d.%d.%d.%d.\n", id, CONVIP(server[id].ip));
-			RFIFOSKIP(fd,6);
-		break;
+			case 0x2736: // ip address update
+				if (RFIFOREST(fd) < 6) return 0;
+				server[id].ip = ntohl(RFIFOL(fd, 2));
+				ShowInfo("Updated IP address of map-server #%d to %d.%d.%d.%d.\n", id, CONVIP(server[id].ip));
+				RFIFOSKIP(fd,6);
+			break;
 
-		case 0x3008:
-			if( RFIFOREST(fd) < RFIFOW(fd,4) )
-				return 0;/* packet wasn't fully received yet (still fragmented) */
-			else {
-				int sfd;/* stat server fd */
-				RFIFOSKIP(fd, 2);/* we skip first 2 bytes which are the 0x3008, so we end up with a buffer equal to the one we send */
+			case 0x3008:
+				if( RFIFOREST(fd) < RFIFOW(fd,4) )
+					return 0;/* packet wasn't fully received yet (still fragmented) */
+				else {
+					int sfd;/* stat server fd */
+					RFIFOSKIP(fd, 2);/* we skip first 2 bytes which are the 0x3008, so we end up with a buffer equal to the one we send */
 
-				if( (sfd = make_connection(host2ip("stats.hercules.ws"),(uint16)25421,true) ) == -1 ) {
-					RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
-					break;/* connection not possible, we drop the report */
-				}
+					if( (sfd = make_connection(host2ip("stats.hercules.ws"),(uint16)25421,true) ) == -1 ) {
+						RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+						break;/* connection not possible, we drop the report */
+					}
 
-				session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
+					session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
 
-				WFIFOHEAD(sfd, RFIFOW(fd,2) );
+					WFIFOHEAD(sfd, RFIFOW(fd,2) );
 
-				memcpy((char*)WFIFOP(sfd,0), (char*)RFIFOP(fd, 0), RFIFOW(fd,2));
+					memcpy((char*)WFIFOP(sfd,0), (char*)RFIFOP(fd, 0), RFIFOW(fd,2));
 
-				WFIFOSET(sfd, RFIFOW(fd,2) );
+					WFIFOSET(sfd, RFIFOW(fd,2) );
 
-				flush_fifo(sfd);
+					flush_fifo(sfd);
 
-				do_close(sfd);
+					do_close(sfd);
 
-				RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
-		}
-		break;
+					RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+			}
+			break;
 
 
-		default:
-		{
-			// inter server - packet
-			int r = inter_parse_frommap(fd);
-			if (r == 1) break;		// processed
-			if (r == 2) return 0;	// need more packet
+			default:
+			{
+				// inter server - packet
+				int r = inter_parse_frommap(fd);
+				if (r == 1) break;		// processed
+				if (r == 2) return 0;	// need more packet
 
-			// no inter server packet. no char server packet -> disconnect
-			ShowError("Unknown packet 0x%04x from map server, disconnecting.\n", RFIFOW(fd,0));
-			set_eof(fd);
-			return 0;
-		}
+				// no inter server packet. no char server packet -> disconnect
+				ShowError("Unknown packet 0x%04x from map server, disconnecting.\n", RFIFOW(fd,0));
+				set_eof(fd);
+				return 0;
+			}
 		} // switch
 	} // while
 
@@ -4217,11 +4224,12 @@ int parse_char(int fd)
 					realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
 					char_mapif_init(fd);
 				}
+				socket_datasync(fd, true);
 
 				RFIFOSKIP(fd,60);
 			}
 			return 0; // avoid processing of followup packets here
-
+				
 			// checks the entered pin
 			case 0x8b8:
 				if( RFIFOREST(fd) < 10 )
diff --git a/src/common/socket.c b/src/common/socket.c
index 72633cf2ba9..701fbc685ec 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1337,7 +1337,6 @@ void socket_init(void)
 	ShowInfo("Server supports up to '"CL_WHITE"%u"CL_RESET"' concurrent connections.\n", rlim_cur);
 }
 
-
 bool session_isValid(int fd)
 {
 	return ( fd > 0 && fd < FD_SETSIZE && session[fd] != NULL );
@@ -1377,6 +1376,71 @@ uint16 ntows(uint16 netshort)
 	return ((netshort & 0xFF) << 8) | ((netshort & 0xFF00) >> 8);
 }
 
+/* [Ind/Hercules] - socket_datasync */
+void socket_datasync(int fd, bool send) {
+	struct {
+		unsigned int length;/* short is not enough for some */
+	} data_list[] = {
+		{ sizeof(struct mmo_charstatus) },
+		{ sizeof(struct quest) },
+		{ sizeof(struct item) },
+		{ sizeof(struct point) },
+		{ sizeof(struct s_skill) },
+		{ sizeof(struct global_reg) },
+		{ sizeof(struct accreg) },
+		{ sizeof(struct status_change_data) },
+		{ sizeof(struct storage_data) },
+		{ sizeof(struct guild_storage) },
+		{ sizeof(struct s_pet) },
+		{ sizeof(struct s_mercenary) },
+		{ sizeof(struct s_homunculus) },
+		{ sizeof(struct s_elemental) },
+		{ sizeof(struct s_friend) },
+		{ sizeof(struct mail_message) },
+		{ sizeof(struct mail_data) },
+		{ sizeof(struct registry) },
+		{ sizeof(struct party_member) },
+		{ sizeof(struct party) },
+		{ sizeof(struct guild_member) },
+		{ sizeof(struct guild_position) },
+		{ sizeof(struct guild_alliance) },
+		{ sizeof(struct guild_expulsion) },
+		{ sizeof(struct guild_skill) },
+		{ sizeof(struct guild) },
+		{ sizeof(struct guild_castle) },
+		{ sizeof(struct fame_list) },
+	};
+	unsigned short i;
+	if( send ) {
+		unsigned short p_len = ( sizeof(data_list) * 4 ) + 4;
+		WFIFOHEAD(fd, p_len);
+
+		WFIFOW(fd, 0) = 0x2b0a;
+		WFIFOW(fd, 2) = p_len;
+		
+		for( i = 0; i < sizeof(data_list); i++ ) {
+			WFIFOL(fd, 4 + ( i * 4 ) ) = data_list[i].length;
+		}
+		
+		WFIFOSET(fd, p_len);
+	} else {
+		for( i = 0; i < sizeof(data_list); i++ ) {
+			if( RFIFOL(fd, 4 + (i * 4) ) != data_list[i].length ) {
+				/* force the other to go wrong too so both are taken down */
+				WFIFOHEAD(fd, 8);
+				WFIFOW(fd, 0) = 0x2b0a;
+				WFIFOW(fd, 2) = 8;
+				WFIFOL(fd, 4) = 0;
+				WFIFOSET(fd, 8);
+				flush_fifo(fd);
+				/* shut down */
+				ShowFatalError("Servers are out of sync! recompile from scratch\n");
+				exit(EXIT_FAILURE);
+			}
+		}
+	}
+}
+
 #ifdef SEND_SHORTLIST
 // Add a fd to the shortlist so that it'll be recognized as a fd that needs
 // sending or eof handling.
diff --git a/src/common/socket.h b/src/common/socket.h
index 7c0e02f5d35..4879cb1093e 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -145,6 +145,9 @@ extern int naddr_;   // # of ip addresses
 
 void set_eof(int fd);
 
+/* [Ind/Hercules] - socket_datasync */
+void socket_datasync(int fd, bool send);
+
 /// Use a shortlist of sockets instead of iterating all sessions for sockets 
 /// that have data to send or need eof handling.
 /// Adapted to use a static array instead of a linked list.
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 3672aa52f6c..b816ca4b5e8 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -42,7 +42,7 @@ static DBMap* auth_db; // int id -> struct auth_node*
 static const int packet_len_table[0x3d] = { // U - used, F - free
 	60, 3,-1,27,10,-1, 6,-1,	// 2af8-2aff: U->2af8, U->2af9, U->2afa, U->2afb, U->2afc, U->2afd, U->2afe, U->2aff
 	 6,-1,18, 7,-1,39,30, 10,	// 2b00-2b07: U->2b00, U->2b01, U->2b02, U->2b03, U->2b04, U->2b05, U->2b06, U->2b07
-	 6,30, 0, 0,86, 7,44,34,	// 2b08-2b0f: U->2b08, U->2b09, F->2b0a, F->2b0b, U->2b0c, U->2b0d, U->2b0e, U->2b0f
+	 6,30, -1, 0,86, 7,44,34,	// 2b08-2b0f: U->2b08, U->2b09, U->2b0a, F->2b0b, U->2b0c, U->2b0d, U->2b0e, U->2b0f
 	11,10,10, 0,11, 0,266,10,	// 2b10-2b17: U->2b10, U->2b11, U->2b12, F->2b13, U->2b14, F->2b15, U->2b16, U->2b17
 	 2,10, 2,-1,-1,-1, 2, 7,	// 2b18-2b1f: U->2b18, U->2b19, U->2b1a, U->2b1b, U->2b1c, U->2b1d, U->2b1e, U->2b1f
 	-1,10, 8, 2, 2,14,19,19,	// 2b20-2b27: U->2b20, U->2b21, U->2b22, U->2b23, U->2b24, U->2b25, U->2b26, U->2b27
@@ -67,7 +67,7 @@ static const int packet_len_table[0x3d] = { // U - used, F - free
 //2b07: Outgoing, chrif_removefriend -> 'Tell charserver to remove friend_id from char_id friend list'
 //2b08: Outgoing, chrif_searchcharid -> '...'
 //2b09: Incoming, map_addchariddb -> 'Adds a name to the nick db'
-//2b0a: FREE
+//2b0a: Incoming/Outgoing, socket_datasync()
 //2b0b: FREE
 //2b0c: Outgoing, chrif_changeemail -> 'change mail address ...'
 //2b0d: Incoming, chrif_changedsex -> 'Change sex of acc XY'
@@ -468,6 +468,8 @@ int chrif_connectack(int fd) {
 		ShowStatus("Event '"CL_WHITE"OnInterIfInitOnce"CL_RESET"' executed with '"CL_WHITE"%d"CL_RESET"' NPCs.\n", npc_event_doall("OnInterIfInitOnce"));
 		guild_castle_map_init();
 	}
+	
+	socket_datasync(fd, true);
 
 	return 0;
 }
@@ -1429,6 +1431,7 @@ int chrif_parse(int fd) {
 			case 0x2b04: chrif_recvmap(fd); break;
 			case 0x2b06: chrif_changemapserverack(RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14), RFIFOW(fd,18), RFIFOW(fd,20), RFIFOW(fd,22), RFIFOL(fd,24), RFIFOW(fd,28)); break;
 			case 0x2b09: map_addnickdb(RFIFOL(fd,2), (char*)RFIFOP(fd,6)); break;
+			case 0x2b0a: socket_datasync(fd, false); break;
 			case 0x2b0d: chrif_changedsex(fd); break;
 			case 0x2b0f: chrif_char_ask_name_answer(RFIFOL(fd,2), (char*)RFIFOP(fd,6), RFIFOW(fd,30), RFIFOW(fd,32)); break;
 			case 0x2b12: chrif_divorceack(RFIFOL(fd,2), RFIFOL(fd,6)); break;