- Corrected land protector's duration according to the descriptions

- Fixed "pc drop item" doing the incorrect check to see if the player was trading.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10252 54d463be-8e91-2dee-dedb-b68131a5f0ec

db/Changelog.txt

@@ -20,6 +20,8 @@
 
 ========================
 04/14
+	* Corrected land protector's duration according to the descriptions
+	  [Skotlex]
 	* Fixed Eremes using Venomdust on self instead of target [Playtester]
 04/13
 	* Updated Aegis name, price and weight of etc items [Playtester]

db/skill_cast_db.txt

@@ -453,7 +453,7 @@
 //-- SA_VIOLENTGALE
 287,5000,0,0,60000:120000:180000:240000:300000,0
 //-- SA_LANDPROTECTOR
-288,5000,0,0,120000:165000:210000:245000:300000,0
+288,5000,0,0,165000:210000:255000:300000:345000,0
 //-- SA_DISPELL
 289,2000,0,0,0,0
 //-- SA_REVERSEORCISH

src/map/pc.c

@@ -2803,9 +2803,9 @@ int pc_dropitem(struct map_session_data *sd,int n,int amount)
 		return 0;
 
 	if(sd->status.inventory[n].nameid <= 0 ||
-		sd->status.inventory[n].amount < amount ||
-		sd->trade_partner != 0 || sd->vender_id != 0 ||
 		sd->status.inventory[n].amount <= 0 ||
+		sd->status.inventory[n].amount < amount ||
+		sd->state.trading || sd->vender_id != 0 ||
 		!sd->inventory_data[n] //pc_delitem would fail on this case.
 		)
 		return 0;