diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-07-25 14:07:45 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-07-25 14:07:45 +0300 |
| commit | 0a18dda158e8f256de121ed2cf7a7a161a083b1c (patch) | |
| tree | 35aaf6111a3694661e5d602481809830fbc7176f /src/inventorymanager.cpp | |
| parent | 9eaf93d41d6745b877f8f52cf54b21050abefda1 (diff) | |
| download | minetest-0a18dda158e8f256de121ed2cf7a7a161a083b1c.tar.gz minetest-0a18dda158e8f256de121ed2cf7a7a161a083b1c.tar.bz2 minetest-0a18dda158e8f256de121ed2cf7a7a161a083b1c.zip | |
Remove special handling of creative mode
Diffstat (limited to 'src/inventorymanager.cpp')
| -rw-r--r-- | src/inventorymanager.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
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"<<std::endl; - - mgr->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"<<std::endl; + + mgr->setInventoryModified(from_inv); } infostream<<"IDropAction::apply(): dropped " |