diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-23 19:56:01 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-23 19:56:01 +0000 |
| commit | fea1f5fe47668fb1119c7805bcc934fc8b30579a (patch) | |
| tree | b3078d0a37f5c149977d80bd0112738f747bcbfd | |
| parent | a072cb579041699023f5197ffcb303acef112e2f (diff) | |
| download | hercules-fea1f5fe47668fb1119c7805bcc934fc8b30579a.tar.gz hercules-fea1f5fe47668fb1119c7805bcc934fc8b30579a.tar.bz2 hercules-fea1f5fe47668fb1119c7805bcc934fc8b30579a.tar.xz hercules-fea1f5fe47668fb1119c7805bcc934fc8b30579a.zip | |
- 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
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/pc.c | 1 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5568fc2c8..00f7d4ba2 100644 --- a/Changelog-Trunk.txt +++ b/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
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:
|