summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-24 19:49:20 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-24 19:49:20 +0000
commitac1c7e9dc3353a3534c284f212f2ee0075bd4b4c (patch)
tree4813fc953812be530c8e6457690e47db7440a9e0
parent97c9f85e09080097835be749cc44adf9e79d10ef (diff)
downloadhercules-ac1c7e9dc3353a3534c284f212f2ee0075bd4b4c.tar.gz
hercules-ac1c7e9dc3353a3534c284f212f2ee0075bd4b4c.tar.bz2
hercules-ac1c7e9dc3353a3534c284f212f2ee0075bd4b4c.tar.xz
hercules-ac1c7e9dc3353a3534c284f212f2ee0075bd4b4c.zip
Fixed a crash when Slim Pitcher is cast (due to one unconverted piece of code)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11796 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 35fe5243d..183799325 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.
2007/11/24
+ * Fixed a crash when Slim Pitcher is cast
* Fixed a crash when a taekwon hits a wall while Sprinting (bugreport:483)
* Added support for latest official client/server packet changes [ultramage]
- enable by setting PACKETVER to 9; note that this breaks older clients
diff --git a/src/map/skill.c b/src/map/skill.c
index 08e87232b..2e18aee59 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4726,7 +4726,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
if (sp)
sp = sp * (100 + pc_checkskill(dstsd,MG_SRECOVERY)*10)/100;
}
- if (tsc && tsc->data[SC_CRITICALWOUND]->timer!=-1)
+ if (tsc && tsc->data[SC_CRITICALWOUND])
{
hp -= hp * tsc->data[SC_CRITICALWOUND]->val2 / 100;
sp -= sp * tsc->data[SC_CRITICALWOUND]->val2 / 100;