diff options
author | shennetsind <ind@henn.et> | 2013-11-06 22:40:57 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-06 22:40:57 -0200 |
commit | b1f7e524a79ce3e7afd64becaa7657c71d59f18f (patch) | |
tree | 3d0f808a23cb1ead6cc0811542ac4263643203dc /src/map/mail.c | |
parent | 47401a4195c58e14f12200f1ba6aeb34ecd87df7 (diff) | |
parent | 6be40f56a21e48505baa4ff69acc198aa6206bf1 (diff) | |
download | hercules-b1f7e524a79ce3e7afd64becaa7657c71d59f18f.tar.gz hercules-b1f7e524a79ce3e7afd64becaa7657c71d59f18f.tar.bz2 hercules-b1f7e524a79ce3e7afd64becaa7657c71d59f18f.tar.xz hercules-b1f7e524a79ce3e7afd64becaa7657c71d59f18f.zip |
Merge remote-tracking branch 'origin/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
conf/messages.conf
src/common/mmo.h
src/map/pc_groups.c
src/map/pc_groups.h
Diffstat (limited to 'src/map/mail.c')
-rw-r--r-- | src/map/mail.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/mail.c b/src/map/mail.c index 2378cbe2a..6b1537d87 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -82,8 +82,9 @@ unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount) { if( amount < 0 || amount > sd->status.inventory[idx].amount ) return 1; if( !pc->can_give_items(sd) || sd->status.inventory[idx].expire_time || - !itemdb_canmail(&sd->status.inventory[idx],pc->get_group_level(sd)) ) - return 1; + !itemdb_canmail(&sd->status.inventory[idx],pc->get_group_level(sd)) || + (sd->status.inventory[idx].bound && !pc->can_give_bounded_items(sd)) ) + return 1; sd->mail.index = idx; sd->mail.nameid = sd->status.inventory[idx].nameid; |