summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-17 18:44:59 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-17 18:44:59 +0000
commit342e0c608d4062cebdaade95923ee48ed492e4a7 (patch)
tree09fa18f00cab077f1784b520ce74c3cf5db80dd2 /src/map/unit.c
parent204e823ebe7eff717d6a3d10484a5021eb7cc1a7 (diff)
downloadhercules-342e0c608d4062cebdaade95923ee48ed492e4a7.tar.gz
hercules-342e0c608d4062cebdaade95923ee48ed492e4a7.tar.bz2
hercules-342e0c608d4062cebdaade95923ee48ed492e4a7.tar.xz
hercules-342e0c608d4062cebdaade95923ee48ed492e4a7.zip
- Fixed pet being incorrectly removed when it had intimacy 0.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6139 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c2
1 files changed, 1 insertions, 1 deletions
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;