diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-04-21 09:36:23 +0200 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-05-10 21:30:33 +0200 |
| commit | 8ef065eada5f135a8837963b878f381e3c597d8a (patch) | |
| tree | ee9516c3c4a095cbd2a9f615337f454b3530fce0 /src/map | |
| parent | 292f740b40842fbf474ffd00e49aa358ee99bac1 (diff) | |
| download | hercules-8ef065eada5f135a8837963b878f381e3c597d8a.tar.gz hercules-8ef065eada5f135a8837963b878f381e3c597d8a.tar.bz2 hercules-8ef065eada5f135a8837963b878f381e3c597d8a.tar.xz hercules-8ef065eada5f135a8837963b878f381e3c597d8a.zip | |
Don't abort auto-cast skills if sd->ud.skilltimer is not INVALID_TIMER
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 4 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index d9b2816bd..2778c0f03 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -12864,7 +12864,7 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill target_id = sd->bl.id; if (sd->ud.skilltimer != INVALID_TIMER) { - if (skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST) + if (skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST && sd->auto_cast_current.type == AUTOCAST_NONE) return; } else if (DIFF_TICK(tick, sd->ud.canact_tick) < 0) { if (sd->auto_cast_current.type == AUTOCAST_NONE) { @@ -13003,7 +13003,7 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin safestrncpy(sd->message, RFIFOP(fd, skillmoreinfo), TALKBOX_MESSAGE_SIZE); } - if( sd->ud.skilltimer != INVALID_TIMER ) + if (sd->ud.skilltimer != INVALID_TIMER && sd->auto_cast_current.type == AUTOCAST_NONE) return; if( DIFF_TICK(tick, sd->ud.canact_tick) < 0 ) { diff --git a/src/map/script.c b/src/map/script.c index d5d81fbe5..14db20549 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11036,7 +11036,7 @@ static BUILDIN(itemskill) { struct map_session_data *sd = script->rid2sd(st); - if (sd == NULL || sd->ud.skilltimer != INVALID_TIMER) + if (sd == NULL) return true; sd->auto_cast_current.type = AUTOCAST_ITEM; |