summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-11 19:43:24 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-11 19:43:24 +0000
commit3629f7531140f7819e9327b80c8e70dea0905047 (patch)
tree6cc04163650265e5cc573b033c6b4060c5dd16ef /src/map
parentc6a57edb3cb1b89ba16fee291fb9344260826570 (diff)
downloadhercules-3629f7531140f7819e9327b80c8e70dea0905047.tar.gz
hercules-3629f7531140f7819e9327b80c8e70dea0905047.tar.bz2
hercules-3629f7531140f7819e9327b80c8e70dea0905047.tar.xz
hercules-3629f7531140f7819e9327b80c8e70dea0905047.zip
Fixed bug with abracadabra self skills not working, bugreport:5310
Also fixed magnificat's non-mado condition git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15566 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c3
-rw-r--r--src/map/status.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 97b4a50fb..2fef37baf 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -446,7 +446,8 @@ int skillnotok (int skillid, struct map_session_data *sd)
// This code will compare the player's attack motion value which is influenced by ASPD before
// allowing a skill to be cast. This is to prevent no-delay ACT files from spamming skills such as
// AC_DOUBLE which do not have a skill delay and are not regarded in terms of attack motion.
- if( sd->canskill_tick && DIFF_TICK(gettick(), sd->canskill_tick) < (sd->battle_status.amotion * (100 + battle_config.skill_amotion_leniency) / 100) )
+ if( sd->skillitem != skillid && sd->canskill_tick &&
+ DIFF_TICK(gettick(), sd->canskill_tick) < (sd->battle_status.amotion * (100 + battle_config.skill_amotion_leniency) / 100) )
{// attempted to cast a skill before the attack motion has finished
return 1;
}
diff --git a/src/map/status.c b/src/map/status.c
index 5fe015450..a65de486b 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5568,6 +5568,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
break;
case SC_MAGNIFICAT:
if( sc->option&OPTION_MADOGEAR ) //Mado is immune to magnificat
+ return 0;
break;
case SC_ONEHAND:
case SC_MERC_QUICKEN: