- Small change that SHOULD fix the pet duplication. Fixing pet incubator still isn't done...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5741 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/03/24
+	* Small change that SHOULD fix the pet duplication issue. [Skotlex]
 	* Fixed Warp Portal. [Skotlex]
 	* Modified script commands atcommand/charcommand to execute even if there
 	  isn't a player attached. They'll use a dummy player data with the same

src/map/pet.c

@@ -379,6 +379,7 @@ int pet_return_egg(struct map_session_data *sd)
 		if(battle_config.pet_status_support && sd->pet.intimate > 0)
 			status_calc_pc(sd,0);
 		memset(&sd->pet, 0, sizeof(struct s_pet));
+		sd->status.pet_id = 0;
 		sd->pet.incuvate = 1;
 		sd->petDB = NULL;
 	}
@@ -512,6 +513,8 @@ int pet_recv_petdata(int account_id,struct s_pet *p,int flag)
 		  	if (battle_config.error_log)
 				ShowError("pet_recv_petdata: Hatching pet (%d:%s) aborted, couldn't find egg in inventory for removal!\n",p->pet_id, p->name);
 			sd->status.pet_id = 0;
+			memset(&sd->pet,0,sizeof(struct s_pet));
+			sd->pet.incuvate = 1;
 			return 1;
 		}
 		if (!pet_birth_process(sd)) //Pet hatched. Delete egg.