summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcookiecrumbs <cookiecrumbs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-17 01:45:25 +0000
committercookiecrumbs <cookiecrumbs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-17 01:45:25 +0000
commit43aac3145c7c6b6fb20a1361e504d24f3e1f589d (patch)
tree2eaa86393af3c97db027273ac1488d3028199203 /src
parenta35af913f32524030fed6a43643d80c26ca0d468 (diff)
downloadhercules-43aac3145c7c6b6fb20a1361e504d24f3e1f589d.tar.gz
hercules-43aac3145c7c6b6fb20a1361e504d24f3e1f589d.tar.bz2
hercules-43aac3145c7c6b6fb20a1361e504d24f3e1f589d.tar.xz
hercules-43aac3145c7c6b6fb20a1361e504d24f3e1f589d.zip
Fixed bugreport:5534 where the SC wasn't ended. This resolves the issues with Sealed Shrine and NPC_INVINCIBLEOFF and NPC_INVINCIBLE.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16647 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index fff7902d9..cf35fc624 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5170,7 +5170,15 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
case NPC_MAGICMIRROR:
case ST_PRESERVE:
case NPC_INVINCIBLE:
- case NPC_INVINCIBLEOFF:
+ /* if invincible, end the SC for off state */
+ if(skillid == NPC_INVINCIBLE)
+ status_change_end(bl, SC_INVINCIBLEOFF, INVALID_TIMER);
+
+ /* if invincible off, end the SC for on state */
+ case NPC_INVINCIBLEOFF:
+ if(skillid == NPC_INVINCIBLEOFF)
+ status_change_end(bl, SC_INVINCIBLE, INVALID_TIMER);
+
case RK_DEATHBOUND:
case AB_RENOVATIO:
case AB_EXPIATIO: