summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/skill_cast_db.txt2
-rw-r--r--src/map/pc.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 548ab5dd7..1d818ca79 100644
--- a/db/Changelog.txt
+++ b/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]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 5095cfbdc..346d7cdb9 100644
--- a/db/skill_cast_db.txt
+++ b/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
diff --git a/src/map/pc.c b/src/map/pc.c
index 7ea090113..90b9217ab 100644
--- a/src/map/pc.c
+++ b/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;