3 files changed, 25 insertions, 2 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 657436f49..787d59038 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -898,7 +898,7 @@ bool LocalPlayer::pickUp(FloorItem *const item)
     {
         if (actorSpriteManager && actorSpriteManager->checkForPickup(item))
         {
-            Net::getPlayerHandler()->pickUp(item);
+            PlayerInfo::pickUpItem(item, true);
             mPickUpTarget = nullptr;
         }
     }
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index 3d311dd91..169ee5be3 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -24,6 +24,7 @@
 #include "client.h"
 #include "configuration.h"
 #include "depricatedevent.h"
+#include "flooritem.h"
 #include "inventory.h"
 #include "itemsoundmanager.h"
 
@@ -321,14 +322,31 @@ void useEquipItem2(const Item *const item, bool sfx)
         {
             if (mProtectedItems.find(item->getId()) == mProtectedItems.end())
             {
-                Net::getInventoryHandler()->useItem(item);
                 if (sfx)
                     ItemSoundManager::playSfx(item, SOUND_EVENT_USE);
+                Net::getInventoryHandler()->useItem(item);
             }
         }
     }
 }
 
+void dropItem(const Item *const item, const int amount, bool sfx)
+{
+    if (item && mProtectedItems.find(item->getId()) == mProtectedItems.end())
+    {
+        if (sfx)
+            ItemSoundManager::playSfx(item, SOUND_EVENT_DROP);
+        Net::getInventoryHandler()->dropItem(item, amount);
+    }
+}
+
+void pickUpItem(const FloorItem *const item, bool sfx)
+{
+    if (sfx)
+        ItemSoundManager::playSfx(item, SOUND_EVENT_PICKUP);
+    Net::getPlayerHandler()->pickUp(item);
+}
+
 // --- Misc -------------------------------------------------------------------
 
 void setBackend(const PlayerInfoBackend &backend)
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index cd454692f..eef07c584 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -61,6 +61,7 @@ struct PlayerInfoBackend final
     IntMap mSkills;
 };
 
+class FloorItem;
 class Inventory;
 class Item;
 
@@ -267,6 +268,10 @@ namespace PlayerInfo
 
     void useEquipItem2(const Item *const item, bool sfx);
 
+    void dropItem(const Item *const item, const int amount, bool sfx);
+
+    void pickUpItem(const FloorItem *const item, bool sfx);
+
     void protectItem(const int id);
 
     void unprotectItem(const int id);