diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-01-19 15:42:32 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-01-19 15:42:32 +0000 |
| commit | e300536e2257c55c1a1baf4e041b022adb862790 (patch) | |
| tree | 1436e2fc7e591b45ec91c7b6d4d97d58a3cc8858 | |
| parent | 0529fa63b009df33b06057a7f23670f873cefed9 (diff) | |
| download | hercules-e300536e2257c55c1a1baf4e041b022adb862790.tar.gz hercules-e300536e2257c55c1a1baf4e041b022adb862790.tar.bz2 hercules-e300536e2257c55c1a1baf4e041b022adb862790.tar.xz hercules-e300536e2257c55c1a1baf4e041b022adb862790.zip | |
Intimidate should warp you anyway even if the target died.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14220 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f5d101a50..1ab4b2709 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2010/01/19 + * Snatch should warp you anyway even if the target died. [Inkfish] 2010/01/16 * Fixed items don't grant skill if you had this skill before and then changed your job. [Inkfish] 2010/01/14 diff --git a/src/map/skill.c b/src/map/skill.c index 621454760..8fadb870e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2313,7 +2313,7 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr data) break; if(skl->target_id) { target = map_id2bl(skl->target_id); - if(!target && skl->skill_id == RG_INTIMIDATE) + if( skl->skill_id == RG_INTIMIDATE && (!target || target->prev == NULL) ) target = src; //Required since it has to warp. if(target == NULL) break; |