summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-12 20:08:38 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-12 20:08:38 +0000
commit7cc7a44ec1ba5a64e978fa0f89f45f70da10a748 (patch)
tree0ace98ce54f6c9506f947df131f5edbff8267426
parent6ee18742b9d9ab0f50865eeb0fadf0bffa9eb1fe (diff)
downloadhercules-7cc7a44ec1ba5a64e978fa0f89f45f70da10a748.tar.gz
hercules-7cc7a44ec1ba5a64e978fa0f89f45f70da10a748.tar.bz2
hercules-7cc7a44ec1ba5a64e978fa0f89f45f70da10a748.tar.xz
hercules-7cc7a44ec1ba5a64e978fa0f89f45f70da10a748.zip
- Resurrection will now silently fail when used on non-undead + not-dead characters.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7638 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/unit.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 669f96247..f1790d1b1 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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.
2006/07/12
+ * Resurrection will now silently fail when used on non-undead + not-dead
+ characters. [Skotlex]
* Poem of bragi/magic String's base delay reduction at level 10 (or above)
is now 50% instead of 3*lv%. [Skotlex]
* status_damage will no longer fail when the target is not on a map AND the
diff --git a/src/map/unit.c b/src/map/unit.c
index 80c4a7260..2845ff60b 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -850,7 +850,8 @@ int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int
if(battle_check_undead(tstatus->race,tstatus->def_ele)){
temp=1;
casttime = skill_castfix(src, PR_TURNUNDEAD, skill_lv);
- }
+ } else if (!status_isdead(target))
+ return 0; //Can't cast on non-dead characters.
break;
case MO_FINGEROFFENSIVE:
if(sd)