From 3749a1a7585dd207ce249287585f2450b5c50ca5 Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 29 Jun 2006 20:25:54 +0000 Subject: - Made the map server send list of characters online to the char-server on reconnection regardless of "kick_on_disconnect" setting, as otherwise, a temporary disconnection would make the char-server tag all characters offline and refuse to save them afterwards. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7399 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/chrif.c | 3 +-- src/map/trade.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/map') diff --git a/src/map/chrif.c b/src/map/chrif.c index c5b71db03..211dcb6f4 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -413,8 +413,7 @@ int chrif_sendmapack(int fd) chrif_state = 2; //If there are players online, send them to the char-server. [Skotlex] - if (!kick_on_disconnect) - send_users_tochar(-1, gettick(), 0, 0); + send_users_tochar(-1, gettick(), 0, 0); //Re-save any storages that were modified in the disconnection time. [Skotlex] do_reconnect_storage(); diff --git a/src/map/trade.c b/src/map/trade.c index 407560697..b9c142332 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -33,7 +33,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta return; //Can't trade in notrade mapflag maps. } - if (target_sd == NULL || sd == target_sd) { + if (target_sd == NULL || sd == target_sd) { clif_tradestart(sd, 1); // character does not exist return; } -- cgit v1.2.3-60-g2f50