diff options
| -rw-r--r-- | src/map/atcommand.c | 6 | ||||
| -rw-r--r-- | src/map/pc.c | 4 | ||||
| -rw-r--r-- | src/map/unit.c | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 316e5a39b..cdd257195 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -772,15 +772,15 @@ ACMD(speed) sd->base_status.speed = DEFAULT_WALK_SPEED; else sd->base_status.speed = cap_value(speed, MIN_WALK_SPEED, MAX_WALK_SPEED); - - status_calc_bl(&sd->bl, SCB_SPEED); - + if( sd->base_status.speed != DEFAULT_WALK_SPEED ) { sd->state.permanent_speed = 1; // Set lock when set to non-default speed. clif->message(fd, msg_txt(8)); // Speed changed. } else clif->message(fd, msg_txt(172)); //Speed returned to normal. + status_calc_bl(&sd->bl, SCB_SPEED); + return true; } diff --git a/src/map/pc.c b/src/map/pc.c index a11d5a8d9..7a04f1fb8 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6805,7 +6805,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) { if (sd->status.hom_id > 0){ if(battle_config.homunculus_auto_vapor && sd->hd && !sd->hd->sc.data[SC_LIGHT_OF_REGENE]) - homun->vaporize(sd, HOM_ST_ACTIVE); + homun->vaporize(sd, HOM_ST_REST); } if( sd->md ) @@ -7750,7 +7750,7 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) pc->setoption(sd, i); if(homun_alive(sd->hd) && !pc->checkskill(sd, AM_CALLHOMUN)) - homun->vaporize(sd, HOM_ST_ACTIVE); + homun->vaporize(sd, HOM_ST_REST); if(sd->status.manner < 0) clif->changestatus(sd,SP_MANNER,sd->status.manner); diff --git a/src/map/unit.c b/src/map/unit.c index 0d5b0d8d3..eed9fe3be 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -2236,7 +2236,6 @@ int unit_remove_map(struct block_list *bl, clr_type clrtype, const char* file, i } case BL_HOM: { struct homun_data *hd = (struct homun_data *)bl; - ud->canact_tick = ud->canmove_tick; //It appears HOM do reset the can-act tick. if( !hd->homunculus.intimacy && !(hd->master && !hd->master->state.active) ) { //If logging out, this is deleted on unit->free clif->emotion(bl, E_SOB); |