- Fixed summoned slaves being able to cast onspawn summon-skills (slaves aren't supposed to be able to call minions)

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

2 files changed, 5 insertions, 2 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 56a811e67..0912db564 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.

 

 2006/05/24

+	* Fixed summoned slaves being able to cast onspawn summon-skills (slaves

+	  aren't supposed to be able to call minions) [Skotlex]

 	* The clif_skill_poseffect packet will not be invoked in Snap unless the

 	  skill was successful. May fix the client-position lag. [Skotlex]

 	* Merged item_db.sql from stable (the one from stable was more recent than

diff --git a/src/map/mob.c b/src/map/mob.c
index fe4b32a12..1d099835a 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2427,11 +2427,12 @@ int mob_summonslave(struct mob_data *md2,int *value,int amount,int skill_id)
 		{	//Scale HP

 			md->hp = (md->max_hp*md2->hp)/md2->max_hp;

 		}

-		mob_spawn(md);

-		clif_skill_nodamage(&md->bl,&md->bl,skill_id,amount,1);

 

 		if(skill_id == NPC_SUMMONSLAVE)

 			md->master_id=md2->bl.id;

+

+		mob_spawn(md);

+		clif_skill_nodamage(&md->bl,&md->bl,skill_id,amount,1);

 	}

 	return 0;

 }