From 7ed077a94dd553e5aa7675144ce98fd6e4ce723e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 4 May 2012 01:36:53 +0300
Subject: Add pickup ignore list.

---
 src/localplayer.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/localplayer.cpp')

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 6cf02bf4a..ade74edc1 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -937,8 +937,11 @@ bool LocalPlayer::pickUp(FloorItem *item)
 
     if (dx * dx + dy * dy < dist)
     {
-        Net::getPlayerHandler()->pickUp(item);
-        mPickUpTarget = nullptr;
+        if (actorSpriteManager->checkForPickup(item))
+        {
+            Net::getPlayerHandler()->pickUp(item);
+            mPickUpTarget = nullptr;
+        }
     }
     else if (mPickUpType >= 4 && mPickUpType <= 6)
     {
-- 
cgit v1.2.3-60-g2f50