Fix potential crash when few loot items are registered

[oweals/minetest_game.git] / mods / creative / init.lua

diff --git a/mods/creative/init.lua b/mods/creative/init.lua
index 79f8978f3da090519550aeb6538a4de4d6c70a8d..0f8d4dba50e669457b9241862c79361e9b01e355 100644 (file)
--- a/mods/creative/init.lua
+++ b/mods/creative/init.lua
@@ -1,8 +1,44 @@
+creative = {}
+
+local function update_sfinv(name)
+       minetest.after(0, function()
+               local player = minetest.get_player_by_name(name)
+               if player then
+                       if sfinv.get_page(player):sub(1, 9) == "creative:" then
+                               sfinv.set_page(player, sfinv.get_homepage_name(player))
+                       else
+                               sfinv.set_player_inventory_formspec(player)
+                       end
+               end
+       end)
+end
+
+minetest.register_privilege("creative", {
+       description = "Allow player to use creative inventory",
+       give_to_singleplayer = false,
+       give_to_admin = false,
+       on_grant = update_sfinv,
+       on_revoke = update_sfinv,
+})
+
+local creative_mode_cache = minetest.settings:get_bool("creative_mode")
+
+function creative.is_enabled_for(name)
+       return creative_mode_cache or
+               minetest.check_player_privs(name, {creative = true})
+end
+
 dofile(minetest.get_modpath("creative") .. "/inventory.lua")
 
-if minetest.setting_getbool("creative_mode") then
-       local digtime = 0.5
-       local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 3}
+if creative_mode_cache then
+       -- Dig time is modified according to difference (leveldiff) between tool
+       -- 'maxlevel' and node 'level'. Digtime is divided by the larger of
+       -- leveldiff and 1.
+       -- To speed up digging in creative, hand 'maxlevel' and 'digtime' have been
+       -- increased such that nodes of differing levels have an insignificant
+       -- effect on digtime.
+       local digtime = 42
+       local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 256}
 
        minetest.register_item(":", {
                type = "none",
@@ -22,22 +58,27 @@ if minetest.setting_getbool("creative_mode") then
                        damage_groups = {fleshy = 10},
                }
        })
+end
 
-       minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack)
-               return true
-       end)
+-- Unlimited node placement
+minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack)
+       if placer and placer:is_player() then
+               return creative.is_enabled_for(placer:get_player_name())
+       end
+end)
 
-       function minetest.handle_node_drops(pos, drops, digger)
-               if not digger or not digger:is_player() then
-                       return
-               end
-               local inv = digger:get_inventory()
-               if inv then
-                       for _, item in ipairs(drops) do
-                               item = ItemStack(item):get_name()
-                               if not inv:contains_item("main", item) then
-                                       inv:add_item("main", item)
-                               end
+-- Don't pick up if the item is already in the inventory
+local old_handle_node_drops = minetest.handle_node_drops
+function minetest.handle_node_drops(pos, drops, digger)
+       if not digger or not digger:is_player() or
+               not creative.is_enabled_for(digger:get_player_name()) then
+               return old_handle_node_drops(pos, drops, digger)
+       end
+       local inv = digger:get_inventory()
+       if inv then
+               for _, item in ipairs(drops) do
+                       if not inv:contains_item("main", item, true) then
+                               inv:add_item("main", item)
                        end
                end
        end