diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-24 21:09:43 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-24 21:09:43 +0000 |
| commit | 50baa5db9219929c250395f83e863d9ab57643d4 (patch) | |
| tree | 43d29d73d66562b17051d2eacf852a7db763d5a6 /src | |
| parent | 1a831b71a8824f27e761bc76bc227f94f58f6ef2 (diff) | |
| download | hercules-50baa5db9219929c250395f83e863d9ab57643d4.tar.gz hercules-50baa5db9219929c250395f83e863d9ab57643d4.tar.bz2 hercules-50baa5db9219929c250395f83e863d9ab57643d4.tar.xz hercules-50baa5db9219929c250395f83e863d9ab57643d4.zip | |
Fix
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@781 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/atcommand.c | 4 | ||||
| -rw-r--r-- | src/map/script.c | 9 |
2 files changed, 8 insertions, 5 deletions
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; } |