diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-24 18:45:25 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-24 18:45:25 +0000 |
commit | bf34204a3920da9218d09a698b04a66041ecdf9c (patch) | |
tree | 75445da4cf9fb40696ef8aae68046e2d6d7edfbb | |
parent | 7319a0b56b0df996b92f85a5ac9a662ea82f73dc (diff) | |
download | hercules-bf34204a3920da9218d09a698b04a66041ecdf9c.tar.gz hercules-bf34204a3920da9218d09a698b04a66041ecdf9c.tar.bz2 hercules-bf34204a3920da9218d09a698b04a66041ecdf9c.tar.xz hercules-bf34204a3920da9218d09a698b04a66041ecdf9c.zip |
- 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
-rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
-rw-r--r-- | src/map/mob.c | 5 |
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;
}
|