summaryrefslogtreecommitdiff
path: root/src/map/mob.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-11 22:21:34 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-11 22:21:34 +0000
commit617311ef61537ed544e53e81956b8d687e8b8789 (patch)
treebb5ef9729e094e32cebe157b494b79742811a6b6 /src/map/mob.c
parent8f8e2e42ba3ea1416b80190a3006c061ef4ed8b5 (diff)
downloadhercules-617311ef61537ed544e53e81956b8d687e8b8789.tar.gz
hercules-617311ef61537ed544e53e81956b8d687e8b8789.tar.bz2
hercules-617311ef61537ed544e53e81956b8d687e8b8789.tar.xz
hercules-617311ef61537ed544e53e81956b8d687e8b8789.zip
- Added player not attached crash prevention to countitem/countitem2
- Probably corrected delitem not deleting pet eggs at all. - Possibly nullpo fix on npcskilleffect - Corrected a warning when using #fakename - Hopefully fixed hidenpc/disablenpc not working on Guild flag sprites. - Mob skill state "anytarget" no longer triggers when the mob has an item-target (looting). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9991 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 db519fce9..ee7dfa8c3 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2699,8 +2699,8 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
c2 = ms[i].cond2;
if (ms[i].state != md->state.skillstate) {
- if (md->state.skillstate != MSS_DEAD && (
- ms[i].state == MSS_ANY || (ms[i].state == MSS_ANYTARGET && md->target_id)
+ if (md->state.skillstate != MSS_DEAD && (ms[i].state == MSS_ANY ||
+ (ms[i].state == MSS_ANYTARGET && md->target_id && md->state.skillstate != MSS_LOOT)
)) //ANYTARGET works with any state as long as there's a target. [Skotlex]
;
else