summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorflaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-23 19:49:17 +0000
committerflaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-23 19:49:17 +0000
commit61eba2c6dca99935b2d0702188f1a2dde1f242db (patch)
tree01227533a6d23301abd4f00eceac94c04738fdf7
parentf80a5e94f547d398549b1ad4ba030eea73dcd949 (diff)
downloadhercules-61eba2c6dca99935b2d0702188f1a2dde1f242db.tar.gz
hercules-61eba2c6dca99935b2d0702188f1a2dde1f242db.tar.bz2
hercules-61eba2c6dca99935b2d0702188f1a2dde1f242db.tar.xz
hercules-61eba2c6dca99935b2d0702188f1a2dde1f242db.zip
* Made chrif_save always call pc_makesavestatus. (no reason to prevent the call, and was interfering with multi map-server; fixes bugreport:1400)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14863 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/chrif.c5
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]