summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-28 03:11:08 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-28 03:11:08 +0000
commitf5e374cd18819962de204008040543d6c8025266 (patch)
tree51fff2ac73d8e8ebffd2b04dd343bbd4a6d6ec86
parent5193aa762ab15f3cbaf91fdaa3e4e02096264e0a (diff)
downloadhercules-f5e374cd18819962de204008040543d6c8025266.tar.gz
hercules-f5e374cd18819962de204008040543d6c8025266.tar.bz2
hercules-f5e374cd18819962de204008040543d6c8025266.tar.xz
hercules-f5e374cd18819962de204008040543d6c8025266.zip
- Small fix that should help on multi-map servers when characters are swapping between servers too quickly
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5779 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/clif.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 03f0d8db6..47640aa18 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2164,7 +2164,8 @@ static int clif_delayquit(int tid, unsigned int tick, int id, int data) {
*/
void clif_quitsave(int fd,struct map_session_data *sd)
{
- if (chrif_isconnect() && (!battle_config.prevent_logout || DIFF_TICK(gettick(), sd->canlog_tick) > battle_config.prevent_logout))
+ if (chrif_isconnect() && (sd->state.waitingdisconnect || //Was already waiting to be disconnected.
+ !battle_config.prevent_logout || DIFF_TICK(gettick(), sd->canlog_tick) > battle_config.prevent_logout))
map_quit(sd);
else if (sd->fd)
{ //Disassociate session from player (session is deleted after this function was called)