summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2013-02-21 21:27:35 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2013-02-21 21:27:35 +0800
commit064dad8c094d9c694a73a0110189932c9ab4f257 (patch)
treece9c6d96c0de5963a38964c713c5c8f77a92b897 /src/map/battle.c
parent625981b877c90a69b1ae644013edcd59f9143e9c (diff)
downloadhercules-064dad8c094d9c694a73a0110189932c9ab4f257.tar.gz
hercules-064dad8c094d9c694a73a0110189932c9ab4f257.tar.bz2
hercules-064dad8c094d9c694a73a0110189932c9ab4f257.tar.xz
hercules-064dad8c094d9c694a73a0110189932c9ab4f257.zip
Fixed Bug #7066 and Follow up Bug #4832
-Where KG and OB can hit there Zanzoe. -Ankle Snare should now work properly in GvG. Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
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 3140fbc18..924c9d8a5 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5195,7 +5195,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
case BL_MOB:
if(((((TBL_MOB*)target)->special_state.ai == 2 || //Marine Spheres
(((TBL_MOB*)target)->special_state.ai == 3 && battle_config.summon_flora&1)) && //Floras
- s_bl->type == BL_PC && src->type != BL_MOB) || ((TBL_MOB*)target)->special_state.ai == 4) //Zanzoe
+ s_bl->type == BL_PC && src->type != BL_MOB) || ((TBL_MOB*)target)->special_state.ai == 4 && t_bl->id != src->id) //Zanzoe
{ //Targettable by players
state |= BCT_ENEMY;
strip_enemy = 0;