From 28ad0a20d0de1cd3b4f756fa5fd9207639bc8cfd Mon Sep 17 00:00:00 2001
From: Dennis Friis <peavey@placid.dk>
Date: Tue, 19 Aug 2008 16:02:02 +0000
Subject: Apply patch from fate to fix drop stealing.
---
src/map/pc.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
(limited to 'src/map')
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;
}
--
cgit v1.2.3-70-g09d2