diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/pc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index e5d3bfa..f9e564e 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2944,7 +2944,7 @@ int pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem) if(fitem->first_get_id > 0) { first_sd = map_id2sd(fitem->first_get_id); if(tick < fitem->first_get_tick) { - if(fitem->first_get_id != sd->bl.id && !(first_sd && first_sd->status.party_id == sd->status.party_id)) { + if(fitem->first_get_id != sd->bl.id) { clif_additem(sd,0,0,6); return 0; } @@ -2952,8 +2952,7 @@ int pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem) else if(fitem->second_get_id > 0) { second_sd = map_id2sd(fitem->second_get_id); if(tick < fitem->second_get_tick) { - if(fitem->first_get_id != sd->bl.id && fitem->second_get_id != sd->bl.id && - !(first_sd && first_sd->status.party_id == sd->status.party_id) && !(second_sd && second_sd->status.party_id == sd->status.party_id)) { + if(fitem->first_get_id != sd->bl.id && fitem->second_get_id != sd->bl.id) { clif_additem(sd,0,0,6); return 0; } @@ -2961,9 +2960,7 @@ int pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem) else if(fitem->third_get_id > 0) { third_sd = map_id2sd(fitem->third_get_id); if(tick < fitem->third_get_tick) { - if(fitem->first_get_id != sd->bl.id && fitem->second_get_id != sd->bl.id && fitem->third_get_id != sd->bl.id && - !(first_sd && first_sd->status.party_id == sd->status.party_id) && !(second_sd && second_sd->status.party_id == sd->status.party_id) && - !(third_sd && third_sd->status.party_id == sd->status.party_id)) { + if(fitem->first_get_id != sd->bl.id) { clif_additem(sd,0,0,6); return 0; } |