Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

builtin/../register.lua: Abort make_wrap_deregistration if param is invalid

Browse Source
This commit is contained in:
ANAND 2019-04-28 15:12:20 +05:30 committed by sfan5
parent 96f250ed8f
commit 72feab081c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/game/register.lua
View File

@ -514,11 +514,17 @@ local function make_registration_wrap(reg_fn_name, clear_fn_name)
end end
local function make_wrap_deregistration(reg_fn, clear_fn, list) local function make_wrap_deregistration(reg_fn, clear_fn, list)
local unregister = function (unregistered_key) local unregister = function (key)
if type(key) ~= "string" then
error("key is not a string", 2)
end
if not list[key] then
error("Attempt to unregister non-existent element - '" .. key .. "'", 2)
end
local temporary_list = table.copy(list) local temporary_list = table.copy(list)
clear_fn() clear_fn()
for k,v in pairs(temporary_list) do for k,v in pairs(temporary_list) do
if unregistered_key ~= k then if key ~= k then
reg_fn(v) reg_fn(v)
end end
end end
@ -564,7 +570,8 @@ core.registered_biomes = make_registration_wrap("register_biome", "cle
core.registered_ores = make_registration_wrap("register_ore", "clear_registered_ores") core.registered_ores = make_registration_wrap("register_ore", "clear_registered_ores")
core.registered_decorations = make_registration_wrap("register_decoration", "clear_registered_decorations") core.registered_decorations = make_registration_wrap("register_decoration", "clear_registered_decorations")
core.unregister_biome = make_wrap_deregistration(core.register_biome, core.clear_registered_biomes, core.registered_biomes) core.unregister_biome = make_wrap_deregistration(core.register_biome,
core.clear_registered_biomes, core.registered_biomes)
core.registered_on_chat_messages, core.register_on_chat_message = make_registration() core.registered_on_chat_messages, core.register_on_chat_message = make_registration()
core.registered_globalsteps, core.register_globalstep = make_registration() core.registered_globalsteps, core.register_globalstep = make_registration()