summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-07-25 14:07:45 +0300
committerPerttu Ahola <celeron55@gmail.com>2012-07-25 14:07:45 +0300
commit0a18dda158e8f256de121ed2cf7a7a161a083b1c (patch)
tree35aaf6111a3694661e5d602481809830fbc7176f /src/server.cpp
parent9eaf93d41d6745b877f8f52cf54b21050abefda1 (diff)
downloadminetest-0a18dda158e8f256de121ed2cf7a7a161a083b1c.tar.gz
minetest-0a18dda158e8f256de121ed2cf7a7a161a083b1c.tar.bz2
minetest-0a18dda158e8f256de121ed2cf7a7a161a083b1c.zip
Remove special handling of creative mode
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp14
1 files changed, 3 insertions, 11 deletions
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;
}