Browse Source

* 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://svn.code.sf.net/p/rathena/svn/trunk@14863 54d463be-8e91-2dee-dedb-b68131a5f0ec
flaviojs 14 years ago
parent
commit
762dcdc316
2 changed files with 4 additions and 3 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 2 3
      src/map/chrif.c

+ 2 - 0
Changelog-Trunk.txt

@@ -1,5 +1,7 @@
 Date	Added
 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
 2011/06/22
 	* Plagiarized skills are now removed on jobchange (bugreport:4973) [ultramage]
 	* Plagiarized skills are now removed on jobchange (bugreport:4973) [ultramage]
 2011/06/19
 2011/06/19

+ 2 - 3
src/map/chrif.c

@@ -268,9 +268,8 @@ int chrif_save(struct map_session_data *sd, int flag)
 {
 {
 	nullpo_retr(-1, sd);
 	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.
 	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]
 		//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]