summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-14 04:09:40 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-14 04:09:40 +0000
commit8c4062d16fa6997951d37493f6f581854e5ce7cb (patch)
tree6085cab45497189fff1eb151aa071d379abd847b /src
parent74e76ec984c18663a2cf90a1b2e1a562bde258c2 (diff)
downloadhercules-8c4062d16fa6997951d37493f6f581854e5ce7cb.tar.gz
hercules-8c4062d16fa6997951d37493f6f581854e5ce7cb.tar.bz2
hercules-8c4062d16fa6997951d37493f6f581854e5ce7cb.tar.xz
hercules-8c4062d16fa6997951d37493f6f581854e5ce7cb.zip
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10252 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/pc.c4
1 files changed, 2 insertions, 2 deletions
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;