From 0a18dda158e8f256de121ed2cf7a7a161a083b1c Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Wed, 25 Jul 2012 14:07:45 +0300 Subject: Remove special handling of creative mode --- src/inventorymanager.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'src/inventorymanager.cpp') diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp index 5412a5dca..35e986b56 100644 --- a/src/inventorymanager.cpp +++ b/src/inventorymanager.cpp @@ -514,19 +514,13 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame return; } - // Don't remove from inventory in creative mode - if(g_settings->getBool("creative_mode") == true - && from_inv.type == InventoryLocation::PLAYER){ - } - else{ - // Take item from source list - ItemStack item2 = list_from->takeItem(from_i, actually_dropped_count); - - if(item2.count != actually_dropped_count) - errorstream<<"Could not take dropped count of items"<setInventoryModified(from_inv); - } + // Take item from source list + ItemStack item2 = list_from->takeItem(from_i, actually_dropped_count); + + if(item2.count != actually_dropped_count) + errorstream<<"Could not take dropped count of items"<setInventoryModified(from_inv); } infostream<<"IDropAction::apply(): dropped " -- cgit v1.2.3