Browse Source

- Fixed a crash when using Gospel... gomen.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7603 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 years ago
parent
commit
77131c503c
2 changed files with 2 additions and 1 deletions
  1. 1 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/skill.c

+ 1 - 0
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

+ 1 - 1
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));
 		}