3 files changed, 14 insertions, 9 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index a79cbf0fd..63c334492 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8202,8 +8202,9 @@ void clif_parse_WantToConnection(int fd, struct map_session_data *sd)
 		if ((old_sd = map_id2sd(account_id)) != NULL)

 		{	// if same account already connected, we disconnect the 2 sessions

 			//Check for characters with no connection (includes those that are using autotrade) [durf],[Skotlex]

-			if (old_sd->state.finalsave)

-				; //Ack has not arrived yet from char-server, be patient!

+			if (old_sd->state.finalsave || !old_sd->state.auth)

+				; //Previous player is not done loading.

+				//Or he has quit, but is not done saving on the charserver.

 			else if (old_sd->fd)

 				clif_authfail_fd(old_sd->fd, 2); // same id

 			else 

@@ -8387,6 +8388,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 		if (night_flag && map[sd->bl.m].flag.nightenabled)

 			add_timer(gettick()+1000,clif_nighttimer,sd->bl.id,0);

 

+		// Notify everyone that this char logged in [Skotlex].

+		clif_foreachclient(clif_friendslist_toggle_sub, sd->status.account_id, sd->status.char_id, 1);

+

 		//Login Event

 		npc_script_event(sd, NPCE_LOGIN);

 	} else {

diff --git a/src/map/map.c b/src/map/map.c
index 75c428293..12039e914 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -290,7 +290,7 @@ int map_freeblock_unlock_sub(char *file, int lineno)
 	if ((--block_free_lock) == 0) {
 		int i;
 		for (i = 0; i < block_free_count; i++)
-		{	//Directly calling aFree shouldn't be a leak, as Free remembers the size the original pointed to memory was allocated with? [Skotlex]
+		{
 //			aFree(block_free[i]);
 //			_mfree(block_free[i], file, lineno, __func__);
 			_mfree(block_free[i], file, ((block_free[i]?block_free[i]->type:0)*100000)+lineno, __func__);
@@ -300,7 +300,7 @@ int map_freeblock_unlock_sub(char *file, int lineno)
 	} else if (block_free_lock < 0) {
 		if (battle_config.error_log)
 			ShowError("map_freeblock_unlock: lock count < 0 !\n");
-		block_free_lock = 0; // 次回以降のロックに支障が出てくるのでリセット
+		block_free_lock = 0;
 	}
 
 	return block_free_lock;
@@ -1660,8 +1660,12 @@ void map_deliddb(struct block_list *bl) {
  */
 int map_quit(struct map_session_data *sd) {
 
-	//nullpo_retr(0, sd); //Utterly innecessary, all invokations to this function already have an SD non-null check.
-	//Learn to use proper coding and stop relying on nullpo_'s for safety :P [Skotlex]
+	if(!sd->state.auth) { //Removing a player that hasn't even finished loading
+		idb_remove(pc_db,sd->status.account_id);
+		idb_remove(charid_db,sd->status.char_id);
+		idb_remove(id_db,sd->bl.id);
+		return 0;
+	}
 	if(!sd->state.waitingdisconnect) {
 		if (sd->npc_timer_id != -1) //Cancel the event timer.
 			npc_timerevent_quit(sd);
diff --git a/src/map/pc.c b/src/map/pc.c
index 8f7548dc0..9436444f2 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -694,9 +694,6 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
 	if (map_charid2nick(sd->status.char_id) == NULL)
 		map_addchariddb(sd->status.char_id, sd->status.name);
 
-	// Notify everyone that this char logged in [Skotlex].
-	clif_foreachclient(clif_friendslist_toggle_sub, sd->status.account_id, sd->status.char_id, 1);
-	
 	//Prevent S. Novices from getting the no-death bonus just yet. [Skotlex]
 	sd->die_counter=-1;
 	//Until the reg values arrive, set them to not require trigger...