summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/unit.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index a295e68a9..18b09da95 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8044,7 +8044,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
clif_set0199(fd,3);
// pet
- if(sd->status.pet_id > 0 && sd->pd && sd->pet.intimate > 0) {
+ if(sd->status.pet_id > 0 && sd->pd) {
map_addblock(&sd->pd->bl);
clif_spawn(&sd->pd->bl);
clif_send_petdata(sd,0,0);
diff --git a/src/map/unit.c b/src/map/unit.c
index c8e3738b6..61420d43e 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1606,7 +1606,7 @@ int unit_remove_map(struct block_list *bl, int clrtype) {
map_freeblock_unlock();
return 0;
}
- if (sd->bl.m != bl->m && sd->pet.intimate <= 0)
+ if (sd->pet.intimate <= 0)
{ //Remove pet.
intif_delete_petdata(sd->status.pet_id);
sd->status.pet_id = 0;