summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-06-02 16:19:59 +0200
committerGitHub <noreply@github.com>2018-06-02 16:19:59 +0200
commitb8cdb8e191f17cb0c8798e0379be9d68c72d6368 (patch)
treed177ea2eccf2207423c8deae85021ef7e5949512 /src/map/battle.c
parente6596534654e7ca395c34db5a8d589ebbcaa0a7d (diff)
parent90be2a7937e7552a72d1e7eb632e6bc2d01443ef (diff)
downloadhercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.tar.gz
hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.tar.bz2
hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.tar.xz
hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.zip
Merge pull request #842 from AnnieRuru/request_6
Add new *pcblock script command
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index f257f3c84..6a961afeb 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -6649,7 +6649,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
if (t_bl == s_bl)
break;
- if( sd->state.monster_ignore && flag&BCT_ENEMY )
+ if (sd->block_action.immune && flag&BCT_ENEMY)
return 0; // Global immunity only to Attacks
if (sd->status.karma && s_bl->type == BL_PC && BL_UCCAST(BL_PC, s_bl)->status.karma)
state |= BCT_ENEMY; // Characters with bad karma may fight amongst them