mirror of
https://github.com/minetest/minetest_game.git
synced 2024-11-15 22:40:19 +01:00
Creative: Fix inventory crash after toggling creative mode in-game
This commit is contained in:
parent
3976dc6a5b
commit
b36b154257
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
creative = {}
|
creative = {}
|
||||||
local player_inventory = {}
|
local player_inventory = {}
|
||||||
|
local creative_mode = minetest.setting_getbool("creative_mode")
|
||||||
|
|
||||||
-- Create detached creative inventory after loading all mods
|
-- Create detached creative inventory after loading all mods
|
||||||
creative.init_creative_inventory = function(player)
|
creative.init_creative_inventory = function(player)
|
||||||
|
@ -14,7 +15,7 @@ creative.init_creative_inventory = function(player)
|
||||||
|
|
||||||
minetest.create_detached_inventory("creative_" .. player_name, {
|
minetest.create_detached_inventory("creative_" .. player_name, {
|
||||||
allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
|
allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
|
||||||
if minetest.setting_getbool("creative_mode") and not to_list == "main" then
|
if creative_mode and not to_list == "main" then
|
||||||
return count
|
return count
|
||||||
else
|
else
|
||||||
return 0
|
return 0
|
||||||
|
@ -24,7 +25,7 @@ creative.init_creative_inventory = function(player)
|
||||||
return 0
|
return 0
|
||||||
end,
|
end,
|
||||||
allow_take = function(inv, listname, index, stack, player)
|
allow_take = function(inv, listname, index, stack, player)
|
||||||
if minetest.setting_getbool("creative_mode") then
|
if creative_mode then
|
||||||
return -1
|
return -1
|
||||||
else
|
else
|
||||||
return 0
|
return 0
|
||||||
|
@ -86,7 +87,7 @@ local trash = minetest.create_detached_inventory("creative_trash", {
|
||||||
-- Allow the stack to be placed and remove it in on_put()
|
-- Allow the stack to be placed and remove it in on_put()
|
||||||
-- This allows the creative inventory to restore the stack
|
-- This allows the creative inventory to restore the stack
|
||||||
allow_put = function(inv, listname, index, stack, player)
|
allow_put = function(inv, listname, index, stack, player)
|
||||||
if minetest.setting_getbool("creative_mode") then
|
if creative_mode then
|
||||||
return stack:get_count()
|
return stack:get_count()
|
||||||
else
|
else
|
||||||
return 0
|
return 0
|
||||||
|
@ -155,7 +156,7 @@ end
|
||||||
|
|
||||||
minetest.register_on_joinplayer(function(player)
|
minetest.register_on_joinplayer(function(player)
|
||||||
-- If in creative mode, modify player's inventory forms
|
-- If in creative mode, modify player's inventory forms
|
||||||
if not minetest.setting_getbool("creative_mode") then
|
if not creative_mode then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
creative.init_creative_inventory(player)
|
creative.init_creative_inventory(player)
|
||||||
|
@ -163,7 +164,7 @@ minetest.register_on_joinplayer(function(player)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
if formname ~= "" or not minetest.setting_getbool("creative_mode") then
|
if formname ~= "" or not creative_mode then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -216,7 +217,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
if minetest.setting_getbool("creative_mode") then
|
if creative_mode then
|
||||||
local digtime = 0.5
|
local digtime = 0.5
|
||||||
local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 3}
|
local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 3}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user