diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-10 20:08:25 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-10 20:08:25 +0000 |
| commit | 35c12d9230436bdc9eb2b7312634c0b808e333e6 (patch) | |
| tree | b74d9ed23f5aa83b6456faaa29d843eb695ab59c | |
| parent | 37ba7cf3d283d45443ca8673e58c0d3cb989c42d (diff) | |
| download | hercules-35c12d9230436bdc9eb2b7312634c0b808e333e6.tar.gz hercules-35c12d9230436bdc9eb2b7312634c0b808e333e6.tar.bz2 hercules-35c12d9230436bdc9eb2b7312634c0b808e333e6.tar.xz hercules-35c12d9230436bdc9eb2b7312634c0b808e333e6.zip | |
- Fixed a crash when using Gospel... gomen.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7603 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index a6a69b7f4..39f2bbadc 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/07/10
+ * Fixed a crash when using Gospel... [Skotlex]
* The on-place function won't be invoked on setting ground skills if the
group's tick is greater than the current tick. As Buuyo pointed out, this
should fix Sanctuary and Gospel taking effect inmediately instead of after
diff --git a/src/map/skill.c b/src/map/skill.c index b31f8e93f..8b3576e94 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6019,7 +6019,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s else { sg = skill_unitsetting(src,skillid,skilllv,src->x,src->y,0); - if (sc->data[type].timer != -1) + if (sc && sc->data[type].timer != -1) status_change_end(src,type,-1); //Was under someone else's Gospel. [Skotlex] sc_start4(src,type,100,skilllv,0,(int)sg,BCT_SELF,skill_get_time(skillid,skilllv)); } |