summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-06 19:07:53 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-06 19:07:53 +0000
commit403d1aceaeb74d5994f0390f61cb31b13923168f (patch)
tree7ae86ce62877788177c0c23ee3f2a357de72dfb9 /src/map/battle.c
parentbb0e0bcc5d4da8331f6fb33c879b2d757855722a (diff)
downloadhercules-403d1aceaeb74d5994f0390f61cb31b13923168f.tar.gz
hercules-403d1aceaeb74d5994f0390f61cb31b13923168f.tar.bz2
hercules-403d1aceaeb74d5994f0390f61cb31b13923168f.tar.xz
hercules-403d1aceaeb74d5994f0390f61cb31b13923168f.zip
- Corrected Kaupe so it doesn't ends on the first part of Soul Destroyer.
- Applied some cleaning to the way Tatami Gaeshi knocks back. - Cleaned up the way mobskill_use checks for the correct event. It should fix unlimited mob-skill-casting issues. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9154 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 4e1f2692c..96b61e8d6 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -318,8 +318,10 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
(src->type == BL_PC || !skill_num))
{ //Kaupe only blocks all skills of players.
clif_specialeffect(bl, 462, AREA);
- if (--sc->data[SC_KAUPE].val3 <= 0) //We make it work like Safety Wall, even though it only blocks 1 time.
- status_change_end(bl, SC_KAUPE, -1);
+ //Shouldn't end until Breaker's non-weapon part connects.
+ if (skill_num != ASC_BREAKER || !(flag&BF_WEAPON))
+ if (--sc->data[SC_KAUPE].val3 <= 0) //We make it work like Safety Wall, even though it only blocks 1 time.
+ status_change_end(bl, SC_KAUPE, -1);
return 0;
}