diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-29 16:59:08 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-29 16:59:08 +0000 |
| commit | bd28a6d4b623ee8cc80d39fe1e7bfcf32c8c81ee (patch) | |
| tree | 7a2ad7b67d80aea507602b19a6951758c3afd77f /src/map/pet.c | |
| parent | a664daa20732c695d1f17f09ccf22fc1c343f147 (diff) | |
| download | hercules-bd28a6d4b623ee8cc80d39fe1e7bfcf32c8c81ee.tar.gz hercules-bd28a6d4b623ee8cc80d39fe1e7bfcf32c8c81ee.tar.bz2 hercules-bd28a6d4b623ee8cc80d39fe1e7bfcf32c8c81ee.tar.xz hercules-bd28a6d4b623ee8cc80d39fe1e7bfcf32c8c81ee.zip | |
- 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
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 3 |
1 files changed, 2 insertions, 1 deletions
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;
|