summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-31 21:21:44 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-31 21:21:44 +0000
commit262fc3a9305a930378746a7146694bf08a2027d8 (patch)
tree5077423f91ee8665d321cfde7c9d70ffe1fea9ea
parentf2b4954f2c24e2423ce48f13a6f5a6cb6f51b8ae (diff)
downloadhercules-262fc3a9305a930378746a7146694bf08a2027d8.tar.gz
hercules-262fc3a9305a930378746a7146694bf08a2027d8.tar.bz2
hercules-262fc3a9305a930378746a7146694bf08a2027d8.tar.xz
hercules-262fc3a9305a930378746a7146694bf08a2027d8.zip
- Corrected the mob_ai&2 setting triggering rude-attacked due to can't walk delay.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6901 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/mob.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2a7b16190..0f150a8b7 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/31
+ * Corrected the mob_ai&2 setting triggering rude-attacked due to can't walk
+ delay. [Skotlex]
* Made the char_name_option char_athena.conf setting apply to parties and
guilds as well. It cannot be applied to pets yet without adding a
change-name-request interserver packet. [Skotlex]
diff --git a/src/map/mob.c b/src/map/mob.c
index 087d05546..dfc10b2ac 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1096,8 +1096,9 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap)
{
if (!can_move && (battle_config.mob_ai&2) &&
!battle_check_range(&md->bl, tbl, md->status.rhw.range))
- { //Rude-attacked.
- if (md->attacked_count++ > 3)
+ { //Rude-attacked (avoid triggering due to can-walk delay).
+ if (DIFF_TICK(tick, md->ud.canmove_tick) > 0 &&
+ md->attacked_count++ > 3)
mobskill_use(md, tick, MSC_RUDEATTACKED);
}
} else