summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcookiecrumbs <cookiecrumbs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-22 02:04:16 +0000
committercookiecrumbs <cookiecrumbs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-22 02:04:16 +0000
commitb89584e8396e7a3fc90e94109570f9ebf9c79d27 (patch)
tree59509480dece8b6bebff315e8eb390e77ce40c9d /src
parent88843e765adfc7a6f5b019daffcd34811701ae87 (diff)
downloadhercules-b89584e8396e7a3fc90e94109570f9ebf9c79d27.tar.gz
hercules-b89584e8396e7a3fc90e94109570f9ebf9c79d27.tar.bz2
hercules-b89584e8396e7a3fc90e94109570f9ebf9c79d27.tar.xz
hercules-b89584e8396e7a3fc90e94109570f9ebf9c79d27.zip
Fixed bugreport:5534 (follow up to r16554) where GDB wasn't allowing for 1 HP damage, spellbreaker and eske when in INVINCIBLE state.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16675 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 82a17965a..a6702080f 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1675,7 +1675,8 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
tsc = status_get_sc(target);
if(tsc && tsc->count) {
- if( tsc->data[SC_INVINCIBLE] )
+ /* attacks in invincible are capped to 1 damage and handled in batte.c; allow spell break and eske for sealed shrine GDB when in INVINCIBLE state. */
+ if( tsc->data[SC_INVINCIBLE] && !tsc->data[SC_INVINCIBLEOFF] && skill_num && !(skill_num&(SA_SPELLBREAKER|SL_SKE)) )
return 0;
if(!skill_num && tsc->data[SC_TRICKDEAD])
return 0;