summaryrefslogtreecommitdiff
path: root/src/map/mob.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-29 22:00:51 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-29 22:00:51 +0000
commit8a9600ded15d1846c9e38de0b660a0f6a72e20a9 (patch)
tree2f580058851d7028bef31d2c570aa62c1f955141 /src/map/mob.c
parent9d6ca2f45f252753ae27650565dd3728f14d3bf3 (diff)
downloadhercules-8a9600ded15d1846c9e38de0b660a0f6a72e20a9.tar.gz
hercules-8a9600ded15d1846c9e38de0b660a0f6a72e20a9.tar.bz2
hercules-8a9600ded15d1846c9e38de0b660a0f6a72e20a9.tar.xz
hercules-8a9600ded15d1846c9e38de0b660a0f6a72e20a9.zip
- Corrected the homunculus deletion functions so that the homunculus is deleted together with the character.
- Added npc_check_areanpc so that Wand of Hermod will correctly check for nearby warps. - Emergency avoid now stacks with other speed boost statuses - Item skills and skills that bring up a menu now are cleared on death. - Minor cleanings git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9742 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mob.c')
-rw-r--r--src/map/mob.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index c624643ef..b4ba0be55 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1100,8 +1100,8 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap)
(md->ud.attacktimer == -1 && !status_check_skilluse(&md->bl, tbl, 0, 0)) ||
(md->ud.walktimer != -1 && !(battle_config.mob_ai&0x1) && !check_distance_bl(&md->bl, tbl, md->min_chase)) ||
(
- tbl->type == BL_PC && !(mode&MD_BOSS) &&
- (((TBL_PC*)tbl)->state.gangsterparadise ||
+ tbl->type == BL_PC &&
+ ((((TBL_PC*)tbl)->state.gangsterparadise && !(mode&MD_BOSS)) ||
((TBL_PC*)tbl)->invincible_timer != INVALID_TIMER)
)) { //Unlock current target.
if (tbl && tbl->m != md->bl.m && battle_config.mob_ai&0x40)