diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-05 20:14:13 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-05 20:14:13 +0000 |
| commit | 89ad9c0c16bb729b7215aa8ded3fab0788cee242 (patch) | |
| tree | 612d76c8ac098bdfc4126879e566fed4dff49bee | |
| parent | babf9653c5dd6ec37bc859665d3becf114962afc (diff) | |
| download | hercules-89ad9c0c16bb729b7215aa8ded3fab0788cee242.tar.gz hercules-89ad9c0c16bb729b7215aa8ded3fab0788cee242.tar.bz2 hercules-89ad9c0c16bb729b7215aa8ded3fab0788cee242.tar.xz hercules-89ad9c0c16bb729b7215aa8ded3fab0788cee242.zip | |
- Fixed Kaupe always triggering when the one who was under Kaupe was a player rather than the one attacking...
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6492 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 753ea5f17..240eec6a0 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/05
+ * Fixed Kaupe always triggering when the one who was under Kaupe was a
+ player rather than the one attacking... [Skotlex]
* /doridori now won't double the HP/SP regen of TKs, it only activates
their "happy" state. [Skotlex]
* Added the -50 hit penalty when standing on Wall of Fog. [Skotlex]
diff --git a/src/map/battle.c b/src/map/battle.c index 0bb50eb76..c773cc5bf 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -463,7 +463,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if(sc->data[SC_KAUPE].timer != -1 &&
rand()%100 < sc->data[SC_KAUPE].val2 &&
- (bl->type == BL_PC || !skill_num))
+ (src->type == BL_PC || !skill_num))
{ //Kaupe only blocks all skills of players.
clif_skill_nodamage(bl,bl,SL_KAUPE,1,1);
if (--sc->data[SC_KAUPE].val3 <= 0) //We make it work like Safety Wall, even though it only blocks 1 time.
|