diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-15 13:35:59 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-15 13:35:59 +0000 |
| commit | fac79cd757f3441741f4ad70d9ce511781f8be3f (patch) | |
| tree | 1c32e31135e700f884f6ecce29a2f00995242c3f | |
| parent | 3aa689e30efaac30f0899b44f82dc755e44ac6d7 (diff) | |
| download | hercules-fac79cd757f3441741f4ad70d9ce511781f8be3f.tar.gz hercules-fac79cd757f3441741f4ad70d9ce511781f8be3f.tar.bz2 hercules-fac79cd757f3441741f4ad70d9ce511781f8be3f.tar.xz hercules-fac79cd757f3441741f4ad70d9ce511781f8be3f.zip | |
- Fixed twilight pharmacy dropping 1 item to the ground instead of the qty produced. Thanks to k3dt
- Fixed Plagiarism not working unless you had some sc active.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5607 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5d2a7c483..929766235 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,10 @@ 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. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
+2006/03/15
+ * Fixed twilight pharmacy dropping 1 item to the ground instead of the qty
+ produced. Thanks to k3dt [Skotlex]
+ * Fixed Plagiarism not working unless you had some sc active. [Skotlex]
2006/03/14
* Fixed a possible crash in Venom Splasher if the countdown is too high.
[Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c index f1fff626d..d6804a070 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1906,7 +1906,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds map_freeblock_lock();
if(damage > 0 && dmg.flag&BF_SKILL && tsd
- && pc_checkskill(tsd,RG_PLAGIARISM) && sc && sc->data[SC_PRESERVE].timer == -1
+ && pc_checkskill(tsd,RG_PLAGIARISM)
+ && (!sc || sc->data[SC_PRESERVE].timer == -1)
&& damage < tsd->status.hp)
{ //Updated to not be able to copy skills if the blow will kill you. [Skotlex]
if ((!tsd->status.skill[skillid].id || tsd->status.skill[skillid].flag >= 13) &&
@@ -10831,7 +10832,7 @@ int skill_produce_mix( struct map_session_data *sd, int skill_id, if (tmp_item.amount) { //Success
if((flag = pc_additem(sd,&tmp_item,tmp_item.amount))) {
clif_additem(sd,0,0,flag);
- map_addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,NULL,NULL,NULL,0);
+ map_addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,NULL,NULL,NULL,0);
}
return 1;
}
|