summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-10-09 20:00:51 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-10-09 20:00:51 +0000
commit7d8c845f895fe213b5e463a0638ebdf94f507c0b (patch)
treec2b2360adcb62c1091e271a2c89c6421ccfd4d34 /src/map/pc.c
parentc280d113891f224bc3d2d1728142211e1de59f7d (diff)
downloadtmwa-7d8c845f895fe213b5e463a0638ebdf94f507c0b.tar.gz
tmwa-7d8c845f895fe213b5e463a0638ebdf94f507c0b.tar.bz2
tmwa-7d8c845f895fe213b5e463a0638ebdf94f507c0b.tar.xz
tmwa-7d8c845f895fe213b5e463a0638ebdf94f507c0b.zip
Don't forget to check whether the item owner is still around
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index f023806..e3b9357 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2944,6 +2944,10 @@ can_pick_item_up_from(struct map_session_data *self, int other_id)
struct map_session_data *other = map_id2sd(other_id);
+ /* Other no longer exists? */
+ if (!other)
+ return 1;
+
/* From our partner? */
if (other && self->status.partner_id == other->status.char_id)
return 1;