summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-21 08:44:08 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-21 08:44:08 +0000
commit68afb88f4a8efa91d34b89ffdade8bca00c9cced (patch)
tree4fa20c5503aebfd954c048f05e719f372f1f4b13 /src/map
parentae02e9b64807562b6b69344ec8ebe47fbf83be16 (diff)
downloadhercules-68afb88f4a8efa91d34b89ffdade8bca00c9cced.tar.gz
hercules-68afb88f4a8efa91d34b89ffdade8bca00c9cced.tar.bz2
hercules-68afb88f4a8efa91d34b89ffdade8bca00c9cced.tar.xz
hercules-68afb88f4a8efa91d34b89ffdade8bca00c9cced.zip
* Homunculi now reset their can-act delay on call/resurrect/mapchange (allows bypassing delays by doing rest/call instead of relog) [ultramage]
* Changed Lif's Emergency Avoid to just get a normal skill delay (blocks all skills, cancelled by mapchange / re-summon) instead of getting a persistent block on only this one skill (bugreport:13) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11766 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mercenary.c1
-rw-r--r--src/map/skill.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 3e03da1de..2834f768e 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -643,6 +643,7 @@ void merc_hom_init_timers(struct homun_data * hd)
{
if (hd->hungry_timer == -1)
hd->hungry_timer = add_timer(gettick()+hd->homunculusDB->hungryDelay,merc_hom_hungry,hd->master->bl.id,0);
+ hd->ud.canact_tick = 0; //Reset can-act delay
hd->regen.state.block = 0; //Restore HP/SP block.
}
diff --git a/src/map/skill.c b/src/map/skill.c
index 1726285d1..ba55832a9 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3329,8 +3329,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
sc_start2(bl,type,100,skilllv,skillid,skill_get_time(skillid,skilllv)));
break;
case HLIF_AVOID:
- if (hd)
- skill_blockmerc_start(hd, skillid, skill_get_time2(skillid,skilllv));
case HAMI_DEFENCE:
i = skill_get_time(skillid,skilllv);
clif_skill_nodamage(bl,bl,skillid,skilllv,sc_start(bl,type,100,skilllv,i)); // Master