summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-05 17:55:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-05 17:55:56 +0000
commitb6e528890886089169555661a769fc14361dddb0 (patch)
tree373365dfff9bb0eaea49514822e9253d1dbb86da
parent791b9f2fc76ce2903e2009d4869969e7c96565aa (diff)
downloadhercules-b6e528890886089169555661a769fc14361dddb0.tar.gz
hercules-b6e528890886089169555661a769fc14361dddb0.tar.bz2
hercules-b6e528890886089169555661a769fc14361dddb0.tar.xz
hercules-b6e528890886089169555661a769fc14361dddb0.zip
- Fixed dispell removing SC_NOCHAT
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8635 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8d54d7b68..0fd7e0dbf 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.
2006/09/05
+ * Fixed dispell removing SC_NOCHAT [Skotlex]
* Small fix which should correct skill_attack damaging hidden characters
when it shouldn't. [Skotlex]
* Fixed connect_until field being a smallint rather than int in the login
diff --git a/src/map/skill.c b/src/map/skill.c
index fb7b9e4a4..6d84b7514 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4632,6 +4632,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
|| i==SC_COMBO || i==SC_DANCING || i==SC_GUILDAURA || i==SC_EDP
|| i==SC_AUTOBERSERK || i==SC_CARTBOOST || i==SC_MELTDOWN
|| i==SC_SAFETYWALL || i==SC_SMA || i==SC_SPEEDUP0
+ || i==SC_NOCHAT
)
continue;
if(i==SC_BERSERK) tsc->data[i].val2=0; //Mark a dispelled berserk to avoid setting hp to 100 by setting hp penalty to 0.