- 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://svn.code.sf.net/p/rathena/svn/trunk@5607 54d463be-8e91-2dee-dedb-b68131a5f0ec

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]

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;
 		}