Fix

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@781 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 13 insertions, 7 deletions

diff --git a/Changelog.txt b/Changelog.txt
index f31222fe3..8019391ed 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,8 @@
 Date	Added
 12/24
+	* Fixed a scripting crash (SVN: 780) [MouseJstr]
+	* removed @changesex and @charchangesex until we can
+	  fix it properly [MouseJstr]
 	* Fixed item-dup bug in storage and cart [MouseJstr]
 	* @skilltree was looking outside of the particular class
 	  of the char to see if they could do a skill [MouseJstr]
diff --git a/Dev/GDB_reports.txt b/Dev/GDB_reports.txt
index bd66a9474..c40a5b60d 100644
--- a/Dev/GDB_reports.txt
+++ b/Dev/GDB_reports.txt
@@ -1,7 +1,7 @@
 Mainly because I'm (Ajarn) tired... and not too sure about these, or future ones even...
 I'll report GDB's here. MouseJstr, this is mainly for you.
 
-svn 770:
+svn 770:  Fixed
 -----------------
 #0  buildin_sc_start (st=0xbfbfea30) at script.c:4225
 4225            if(bl->type == BL_PC && ((struct map_session_data *)bl)->state.potionpitcher_flag)
@@ -39,4 +39,4 @@ $5 = (struct guild *) 0x0
 -----------------
 
 That's all I got for now. I'll keep adding them as they show up (if they are simple),
-if you are away Mouse (or whoever wants to fix them). Reply to them as they are fixed.
\ No newline at end of file
+if you are away Mouse (or whoever wants to fix them). Reply to them as they are fixed.
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index f486db422..4e40ea2ce 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -382,7 +382,7 @@ static AtCommandInfo atcommand_info[] = {
 	{ AtCommand_StatAll,			"@statsall",		60, atcommand_stat_all },
 	{ AtCommand_StatAll,			"@allstats",		60, atcommand_stat_all }, // by fritz
 	{ AtCommand_StatAll,			"@allstat",			60, atcommand_stat_all }, // by fritz
-	{ AtCommand_CharChangeSex,		"@charchangesex",	60, atcommand_char_change_sex }, // by Yor
+//	{ AtCommand_CharChangeSex,		"@charchangesex",	60, atcommand_char_change_sex }, // by Yor
 	{ AtCommand_CharBlock,			"@block",			60, atcommand_char_block }, // by Yor
 	{ AtCommand_CharBlock,			"@charblock",		60, atcommand_char_block }, // by Yor
 	{ AtCommand_CharBan,			"@ban",				60, atcommand_char_ban }, // by Yor
@@ -457,7 +457,7 @@ static AtCommandInfo atcommand_info[] = {
 	{ AtCommand_UnMute,				"@unmute",			60, atcommand_unmute }, // [Valaris]
 	{ AtCommand_Clearweather,         "@clearweather",   99, atcommand_clearweather }, // Dexity 
 	{ AtCommand_UpTime,				"@uptime",			 0, atcommand_uptime }, // by MC Cameri
-	{ AtCommand_ChangeSex,			"@changesex",		 1, atcommand_changesex }, // by MC Cameri
+//	{ AtCommand_ChangeSex,			"@changesex",		 1, atcommand_changesex }, // by MC Cameri
 	{ AtCommand_Mute,				"@mute",			99, atcommand_mute }, // [celest]
 	{ AtCommand_Mute,				"@red",				99, atcommand_mute }, // [celest]
 	{ AtCommand_WhoZeny,			"@whozeny",			20, atcommand_whozeny }, // [Valaris]
diff --git a/src/map/script.c b/src/map/script.c
index 8ffa7d0ea..c226473b5 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4222,9 +4222,12 @@ int buildin_sc_start(struct script_state *st)
 		bl = map_id2bl(conv_num(st,& (st->stack->stack_data[st->start+5])));
 	else
 	bl = map_id2bl(st->rid);
-	if(bl->type == BL_PC && ((struct map_session_data *)bl)->state.potionpitcher_flag)
-		bl = map_id2bl(((struct map_session_data *)bl)->skilltarget);
-	skill_status_change_start(bl,type,val1,0,0,0,tick,0);
+	
+	if (bl != 0) {
+		if(bl->type == BL_PC && ((struct map_session_data *)bl)->state.potionpitcher_flag)
+			bl = map_id2bl(((struct map_session_data *)bl)->skilltarget);
+		skill_status_change_start(bl,type,val1,0,0,0,tick,0);
+	}
 	return 0;
 }