summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1a2540fb6..a8e379c64 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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.
2008/04/05
+ * Union now consumes sp when not soul linked. (r12499) [Kevin]
* Running into a wall/npc/pc/mob no longer enables spurt. (r12498) [Kevin]
* Fixed unable to move after using a skill to break out of sprint. (r12497) [Kevin]
* DMG no longer stops running. (r12488) [Kevin]
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);