diff options
| author | Streusel <advance_me@hotmail.de> | 2013-02-21 16:49:52 -0800 |
|---|---|---|
| committer | Streusel <advance_me@hotmail.de> | 2013-02-21 16:49:52 -0800 |
| commit | 6165590a1a68653ad1fa3dd14306a2e64dc9c5c9 (patch) | |
| tree | 01c1d41bfbca9964046fb05135bd17105da7f34c /src/map/battle.c | |
| parent | 803169a68c6b3dcf9d0db07b479d4bad65894603 (diff) | |
| parent | 84926b94e869a19f08a7a25df15b4c677316cd32 (diff) | |
| download | hercules-6165590a1a68653ad1fa3dd14306a2e64dc9c5c9.tar.gz hercules-6165590a1a68653ad1fa3dd14306a2e64dc9c5c9.tar.bz2 hercules-6165590a1a68653ad1fa3dd14306a2e64dc9c5c9.tar.xz hercules-6165590a1a68653ad1fa3dd14306a2e64dc9c5c9.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 8d3edec4e..9bf3011bf 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -5210,7 +5210,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; |