- Fixed itemskill variable being cleared before parsing the skill, this causes auto-casted teleport to fail to skip the skill menu. It is now cleared on castend_pos/id directly.

- The item skill/lv variables now use 0 as default to signal they aren't being used (instead of -1)
- Skills with state 'move_enable' will now do a "walk path" check between target cell/object and caster instead of a "shoot path" check, this would fix skills like snap or charge from letting you "teleport" across pits.
- Fixed a possible double map_addblock when hatching a pet egg right before going through a warp.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9275 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 8 insertions, 7 deletions

diff --git a/src/map/pet.c b/src/map/pet.c
index d4069513f..12731cb34 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -459,13 +459,14 @@ int pet_birth_process(struct map_session_data *sd, struct s_pet *pet)
 	if (save_settings&8)

 		chrif_save(sd,0); //is it REALLY Needed to save the char for hatching a pet? [Skotlex]

 

-	map_addblock(&sd->pd->bl);

-	clif_spawn(&sd->pd->bl);

-	clif_send_petdata(sd,0,0);

-	clif_send_petdata(sd,5,battle_config.pet_hair_style);

-	clif_pet_equip(sd->pd);

-	clif_send_petstatus(sd);

-

+	if(sd->bl.prev != NULL) {

+		map_addblock(&sd->pd->bl);

+		clif_spawn(&sd->pd->bl);

+		clif_send_petdata(sd,0,0);

+		clif_send_petdata(sd,5,battle_config.pet_hair_style);

+		clif_pet_equip(sd->pd);

+		clif_send_petstatus(sd);

+	}

 	Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd); 

 

 	return 0;