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/server.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/server.cpp') diff --git a/src/server.cpp b/src/server.cpp index c7698a106..21c936e69 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3131,8 +3131,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) // Placement was handled in lua // Apply returned ItemStack - if(g_settings->getBool("creative_mode") == false) - playersao->setWieldedItem(item); + playersao->setWieldedItem(item); } // If item has node placement prediction, always send the above @@ -3158,8 +3157,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) item, playersao, pointed)) { // Apply returned ItemStack - if(g_settings->getBool("creative_mode") == false) - playersao->setWieldedItem(item); + playersao->setWieldedItem(item); } } // action == 4 @@ -4380,9 +4378,7 @@ void Server::UpdateCrafting(u16 peer_id) // Get a preview for crafting ItemStack preview; - // No crafting in creative mode - if(g_settings->getBool("creative_mode") == false) - getCraftingResult(&player->inventory, preview, false, this); + getCraftingResult(&player->inventory, preview, false, this); // Put the new preview in InventoryList *plist = player->inventory.getList("craftpreview"); @@ -4717,10 +4713,6 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id) scriptapi_on_joinplayer(m_lua, playersao); - /* Creative mode */ - if(g_settings->getBool("creative_mode")) - playersao->createCreativeInventory(); - return playersao; } -- cgit v1.2.3