aboutsummaryrefslogtreecommitdiff
path: root/src/client/client.cpp
diff options
context:
space:
mode:
authorElias Fleckenstein <eliasfleckenstein@web.de>2020-08-14 19:12:14 +0200
committerElias Fleckenstein <eliasfleckenstein@web.de>2020-08-14 19:12:14 +0200
commit9019e18b94940c1e8a2f5f6185692ddf672b61fe (patch)
treea39c909a2e779dd7687a88e5e2f4311cbc9b0bb0 /src/client/client.cpp
parent107dec6c0f1be1de9c1049ba4004e5c08d2e34e3 (diff)
downloaddragonfireclient-9019e18b94940c1e8a2f5f6185692ddf672b61fe.tar.xz
Some Updates
Diffstat (limited to 'src/client/client.cpp')
-rw-r--r--src/client/client.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 0e2b8472f..74e7b9b0d 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1456,6 +1456,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
case InventoryLocation::UNDEFINED:
{}
break;
+ case InventoryLocation::PLAYER:
case InventoryLocation::CURRENT_PLAYER:
{
LocalPlayer *player = m_env.getLocalPlayer();
@@ -1463,15 +1464,6 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
return &player->inventory;
}
break;
- case InventoryLocation::PLAYER:
- {
- // Check if we are working with local player inventory
- LocalPlayer *player = m_env.getLocalPlayer();
- if (!player || strcmp(player->getName(), loc.name.c_str()) != 0)
- return NULL;
- return &player->inventory;
- }
- break;
case InventoryLocation::NODEMETA:
{
NodeMetadata *meta = m_env.getMap().getNodeMetadata(loc.p);