From d6cd24a757c7254914ef048f71aa7e9d4f493fda Mon Sep 17 00:00:00 2001 From: panikon Date: Wed, 19 Feb 2014 20:24:56 -0300 Subject: Readding last merge as last revert was unintended. Sorry for the trouble. --- src/char/char.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/char') diff --git a/src/char/char.c b/src/char/char.c index 1ee3cfd1d..5b497bd0c 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3574,6 +3574,10 @@ int parse_frommap(int fd) cid = RFIFOL(fd, 8); count = RFIFOW(fd, 12); + /* clear; ensure no left overs e.g. permanent */ + 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); + if( count > 0 ) { struct status_change_data data; -- cgit v1.2.3-70-g09d2