- Fixed Devotion not properly being cleared on death/near death in some cases.

- Fixed Shield-Reflect not being correctly ended when devotion does.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5720 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -5,6 +5,10 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/03/23
+	* Fixed Devotion not properly being cleared on death/near death in some
+	  cases. [Skotlex]
+	* Fixed Shield-Reflect not being correctly ended when devotion does.
+	  [Skotlex]
 	* Fixed DEX-based casting time and delay reduction. [blackhole89]
 	* Modified the function pc_percent_heal to prevent overflow problems. [Skotlex]
 	* Changed the second entry in the water_height.txt listing to specify

src/map/pc.c

@@ -4633,6 +4633,7 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage)
 			if (sd->devotion[i]){
 				struct map_session_data *devsd = map_id2sd(sd->devotion[i]);
 				if (devsd) status_change_end(&devsd->bl,SC_DEVOTION,-1);
+				sd->devotion[i] = 0;
 			}
 	}
 

src/map/status.c

@@ -4890,6 +4890,8 @@ int status_change_end( struct block_list* bl , int type,int tid )
 						status_change_end(bl,SC_AUTOGUARD,-1);
 					if (sc->data[SC_DEFENDER].timer != -1)
 						status_change_end(bl,SC_DEFENDER,-1);
+					if (sc->data[SC_REFLECTSHIELD].timer != -1)
+						status_change_end(bl,SC_REFLECTSHIELD,-1);
 				}
 				break;
 			case SC_BLADESTOP: