diff options
| author | Haru <haru@dotalux.com> | 2020-06-28 02:04:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-28 02:04:04 +0200 |
| commit | 74e33aee9e47d0d74bf3ff58b55a823729c529ad (patch) | |
| tree | 48d68c2a3c59c9260f7d39089ffd7c1ae8508e69 /src/map/pc.c | |
| parent | 44db4ecf056d23a114c033eecd7f907a92217a77 (diff) | |
| parent | 604962fd2a7e69c812708d0cb9cfe4130e595ea2 (diff) | |
| download | hercules-74e33aee9e47d0d74bf3ff58b55a823729c529ad.tar.gz hercules-74e33aee9e47d0d74bf3ff58b55a823729c529ad.tar.bz2 hercules-74e33aee9e47d0d74bf3ff58b55a823729c529ad.tar.xz hercules-74e33aee9e47d0d74bf3ff58b55a823729c529ad.zip | |
Merge pull request #2781 from Kenpachi2k13/pet_features
Add some pet features and minor pet code clean up
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index c1261c839..ad669c0c8 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -8148,12 +8148,10 @@ static int pc_dead(struct map_session_data *sd, struct block_list *src) if (sd->status.pet_id > 0 && sd->pd != NULL) { struct pet_data *pd = sd->pd; - if (map->list[sd->bl.m].flag.noexppenalty == 0) { + if (map->list[sd->bl.m].flag.noexppenalty == 0) pet->set_intimate(pd, pd->pet.intimate - pd->petDB->die); - clif->send_petdata(sd, sd->pd, 1, pd->pet.intimate); - } - if (sd->pd->target_id != 0) // Unlock all targets. + if (sd->pd != NULL && sd->pd->target_id != 0) // Unlock all targets. pet->unlocktarget(sd->pd); } |