From 32eac40604b05dc7bc872b0b8a53ab626bd4a060 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 23 May 2006 13:51:42 +0000 Subject: - Corrected clif parse name request failing on disguised characters. - Corrected Soul Drain draining from all non-ground-based skills including non-magic attacks. - Corrected pc_setoption to change the option and then change class. changing option-wedding will automatically convert the view-class as well. - Corrected the 15% drop rate increase when killing higher level mobs in pk-mode triggering for all mobs with lower level than yourself. Thanks to Vayu. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6709 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index 1adff1ad9..2d6199207 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -2829,11 +2829,11 @@ int clif_changelook(struct block_list *bl,int type,int val) vd->class_ = val; if (vd->class_ == JOB_WEDDING || vd->class_ == JOB_XMAS) vd->weapon = vd->shield = 0; - if ( + if (vd->cloth_color && ( (vd->class_ == JOB_WEDDING && battle_config.wedding_ignorepalette) || (vd->class_ == JOB_XMAS && battle_config.xmas_ignorepalette) - ) - vd->cloth_color = 0; + )) + clif_changelook(bl,LOOK_CLOTHES_COLOR,0); break; case LOOK_HAIR: vd->hair_style = val; @@ -8613,7 +8613,7 @@ void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd) { sc = status_get_sc(bl); if (sc && ( (sc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) && !sd->special_state.intravision) || - sc->option&OPTION_INVISIBLE) + (sc->option&OPTION_INVISIBLE && !disguised(bl))) ) { //Asked name of invisible player, this shouldn't be possible! //Possible bot? Thanks to veider and qspirit -- cgit v1.2.3-70-g09d2