diff options
| author | shadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-12 00:31:51 +0000 |
|---|---|---|
| committer | shadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-12 00:31:51 +0000 |
| commit | ef6d3a80a28cace92104288cbbc0e4569b8aca4c (patch) | |
| tree | b7f485ffe6af6891a223f1996f065b27625be65e | |
| parent | cd78dd490000e45dbb8ce70c9f54abc65c3f385f (diff) | |
| download | hercules-ef6d3a80a28cace92104288cbbc0e4569b8aca4c.tar.gz hercules-ef6d3a80a28cace92104288cbbc0e4569b8aca4c.tar.bz2 hercules-ef6d3a80a28cace92104288cbbc0e4569b8aca4c.tar.xz hercules-ef6d3a80a28cace92104288cbbc0e4569b8aca4c.zip | |
Fixed a bad check on NPC_EVILLAND, actually healing players instead of doing damage.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12938 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c5690fedf..0e130261b 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ 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. +2008/07/12 + * Fixed a bad check on NPC_EVILLAND, actually healing players instead of doing damage. [Brainstorm] + 2008/07/10 * Users can't click floating npcs directly. (quick fix for bugreport:1814) [FlavioJS] 2008/07/09 diff --git a/src/map/skill.c b/src/map/skill.c index 1ed9b8268..3777078e6 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6821,7 +6821,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns case UNT_EVILLAND: //Will heal demon and undead element monsters, but not players. - if (bl->type != BL_PC && !battle_check_undead(tstatus->race, tstatus->def_ele) && tstatus->race!=RC_DEMON) + if ((bl->type == BL_PC) || (!battle_check_undead(tstatus->race, tstatus->def_ele) && tstatus->race!=RC_DEMON)) { //Damage enemies if(battle_check_target(&src->bl,bl,BCT_ENEMY)>0) skill_attack(BF_MISC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0); |