diff options
| author | csnv <ctt@csnv.es> | 2014-12-26 19:41:36 +0100 |
|---|---|---|
| committer | csnv <ctt@csnv.es> | 2014-12-26 19:41:36 +0100 |
| commit | 42e9d0b55557a73b60dd3832ba6d75b3b28ff13a (patch) | |
| tree | 30953207375d32a139eb730e196f23fe1a72abd4 /src/map/skill.c | |
| parent | 9e8047ab29838858727f44b8460ebce359dafbb1 (diff) | |
| download | hercules-42e9d0b55557a73b60dd3832ba6d75b3b28ff13a.tar.gz hercules-42e9d0b55557a73b60dd3832ba6d75b3b28ff13a.tar.bz2 hercules-42e9d0b55557a73b60dd3832ba6d75b3b28ff13a.tar.xz hercules-42e9d0b55557a73b60dd3832ba6d75b3b28ff13a.zip | |
Fixes song affecting caster without link
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 6e4d4f024..c2022b0a6 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11908,7 +11908,11 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6 heal = ~heal + 1; clif->skill_nodamage(&src->bl, bl, AL_HEAL, heal, 1); status->heal(bl, heal, 0, 0); + + if (!battle_config.song_timer_reset) + sc_start4(ss, bl, type, 100, sg->skill_lv, sg->val1, sg->val2, 0, sg->limit); } + break; case UNT_POEMBRAGI: case UNT_WHISTLE: case UNT_ASSASSINCROSS: @@ -11917,9 +11921,11 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6 case UNT_FORTUNEKISS: case UNT_SERVICEFORYOU: if (battle_config.song_timer_reset - || (!(battle_config.song_timer_reset) && tsc && tsc->data[type] && tsc->data[type]->val4 == 1) ) + || (!(battle_config.song_timer_reset) && tsc && tsc->data[type] && tsc->data[type]->val4 == 1) + || (sg->src_id == bl->id && !(tsc && tsc->data[SC_SOULLINK] && tsc->data[SC_SOULLINK]->val2 == SL_BARDDANCER)) + ) break; - + sc_start4(ss, bl, type, 100, sg->skill_lv, sg->val1, sg->val2, 0, sg->limit); break; case UNT_TATAMIGAESHI: |