From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 30 Jul 2011 16:05:25 +0000 (+0300)
Subject: Made picking items up in creative mode delete them (because they usually are in the... 
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=4b0c3e435715479ce13df7319298884b1589be22;p=zefram%2Fminetest%2Fminetest_engine.git

Made picking items up in creative mode delete them (because they usually are in the inventory already anyway)
---

diff --git a/src/server.cpp b/src/server.cpp
index ab60be5c..b0c087d0 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2384,10 +2384,10 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 			
 			if(item)
 			{
-				if(g_settings.getBool("creative_mode") == false)
+				InventoryList *ilist = player->inventory.getList("main");
+				if(ilist != NULL)
 				{
-					InventoryList *ilist = player->inventory.getList("main");
-					if(ilist != NULL)
+					if(g_settings.getBool("creative_mode") == false)
 					{
 						// Skip if inventory has no free space
 						if(ilist->getUsedSlots() == ilist->getSize())
@@ -2400,10 +2400,10 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 						ilist->addItem(item);
 						UpdateCrafting(player->peer_id);
 						SendInventory(player->peer_id);
-
-						// Remove object from environment
-						obj->m_removed = true;
 					}
+
+					// Remove object from environment
+					obj->m_removed = true;
 				}
 			}
 			else