From fea1f5fe47668fb1119c7805bcc934fc8b30579a Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 23 Mar 2006 19:56:01 +0000 Subject: - 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5720 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 1 + src/map/status.c | 2 ++ 2 files changed, 3 insertions(+) (limited to 'src') diff --git a/src/map/pc.c b/src/map/pc.c index 40b323f46..03ec2c512 100644 --- a/src/map/pc.c +++ b/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; } } diff --git a/src/map/status.c b/src/map/status.c index ba769b15c..1cb91abc2 100644 --- a/src/map/status.c +++ b/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: -- cgit v1.2.3-70-g09d2