summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index f094eafce..28e18fd44 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5201,14 +5201,15 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
if(sd->status.pet_id > 0 && sd->pd)
{
- struct s_pet *pet = &sd->pd->pet;
- if(!map[sd->bl.m].flag.noexppenalty){
- pet->intimate -= sd->pd->petDB->die;
- if(pet->intimate < 0)
- pet->intimate = 0;
- clif_send_petdata(sd,sd->pd,1,pet->intimate);
- }
- if(sd->pd->target_id) // Unlock all targets...
+ struct pet_data *pd = sd->pd;
+ if( !map[sd->bl.m].flag.noexppenalty && !flag )
+ {
+ pet_set_intimate(pd, pd->pet.intimate - pd->petDB->die);
+ if( pd->pet.intimate < 0 )
+ pd->pet.intimate = 0;
+ clif_send_petdata(sd,sd->pd,1,pd->pet.intimate);
+ }
+ if( sd->pd->target_id ) // Unlock all targets...
pet_unlocktarget(sd->pd);
}