diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/chrif.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 718ff00a9..06533ff68 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/06/23 + * Made chrif_save always call pc_makesavestatus. (no reason to prevent the call, and was interfering with multi map-server; fixes bugreport:1400) [FlavioJS] 2011/06/22 * Plagiarized skills are now removed on jobchange (bugreport:4973) [ultramage] 2011/06/19 diff --git a/src/map/chrif.c b/src/map/chrif.c index 252bb3aaf..8542e618e 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -268,9 +268,8 @@ int chrif_save(struct map_session_data *sd, int flag) { nullpo_retr(-1, sd); - if (!flag) //The flag check is needed to prevent 'nosave' taking effect when a jailed player logs out. - pc_makesavestatus(sd); - + pc_makesavestatus(sd); + if (flag && sd->state.active) //Store player data which is quitting. { //FIXME: SC are lost if there's no connection at save-time because of the way its related data is cleared immediately after this function. [Skotlex] |