summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-05 22:59:13 +0000
committerKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-05 22:59:13 +0000
commitfc6f1554f770414900956c6f6ca45ce39a7fa903 (patch)
tree384f6048f3852211df0f47929273c13fe64ee628 /src/map
parent7a6cfa37c932a2d5893d57343dda44a5c16ad45b (diff)
downloadhercules-fc6f1554f770414900956c6f6ca45ce39a7fa903.tar.gz
hercules-fc6f1554f770414900956c6f6ca45ce39a7fa903.tar.bz2
hercules-fc6f1554f770414900956c6f6ca45ce39a7fa903.tar.xz
hercules-fc6f1554f770414900956c6f6ca45ce39a7fa903.zip
Union now consumes sp when not soul linked. (bugreport:1155)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12499 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 424286e94..2b2ebc8a4 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7915,7 +7915,8 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
if (sc && sc->data[SC_SPIRIT] && sc->data[SC_SPIRIT]->val2 == SL_STAR)
break;
//Auron insists we should implement SP consumption when you are not Soul Linked. [Skotlex]
- if(sp>0 && type&1)
+ //Only invoke on skill begin cast (instant cast skill). [Kevin]
+ if(sp>0 && !type)
{
if (status->sp < (unsigned int)sp)
clif_skill_fail(sd,skill,1,0);