From bd28a6d4b623ee8cc80d39fe1e7bfcf32c8c81ee Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 29 Mar 2006 16:59:08 +0000
Subject: - Applied a fix to not do xs/ys checks on npc_doevent when the npc is
 not on a map. - You can't return to egg a pet that has run away now. - Added
 ers support to the delayed mob drops.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5800 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/pet.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/map/pet.c')

diff --git a/src/map/pet.c b/src/map/pet.c
index 1a8e2d557..0dced634d 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -361,7 +361,8 @@ int pet_return_egg(struct map_session_data *sd)
 	if(sd->status.pet_id && sd->pd) {
 		// ルートしたItemを落とさせる
 		pet_lootitem_drop(sd->pd,sd);
-		if(sd->petDB == NULL)
+		//Avoid returning to egg those pets that already ran away. [Skotlex]
+		if(sd->petDB == NULL || sd->pet.intimate <= 0)
 			return 1;
 		memset(&tmp_item,0,sizeof(tmp_item));
 		tmp_item.nameid = sd->petDB->EggID;
-- 
cgit v1.2.3-60-g2f50