From c969676657eced1e4ca13065d8b7781636b05d9c Mon Sep 17 00:00:00 2001 From: gpcf Date: Tue, 25 Feb 2020 20:43:22 +0100 Subject: [PATCH] Forbid dropping loaded digtron crates (see #44) (#61) * Forbid dropping loaded digtron crates (see #44) This workaround forbids dropping the crates, so the servers should no longer crash so often because of loaded digtron crates. * Check for protection when taking crates --- nodes/node_crate.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nodes/node_crate.lua b/nodes/node_crate.lua index 196b21f..532473a 100644 --- a/nodes/node_crate.lua +++ b/nodes/node_crate.lua @@ -271,7 +271,9 @@ local loaded_on_dig = function(pos, player, loaded_node_name) local inv = player:get_inventory() local stack = inv:add_item("main", stack) if stack:get_count() > 0 then - minetest.add_item(pos, stack) + -- prevent crash by not dropping loaded crate (see #44) + -- minetest.add_item(pos, stack) + return false end -- call on_dignodes callback minetest.remove_node(pos) @@ -333,6 +335,7 @@ minetest.register_node("digtron:loaded_crate", { after_place_node = function(pos, placer, itemstack, pointed_thing) loaded_after_place(pos, itemstack) end, + on_drop = function(a, b, c) end -- prevent dropping loaded digtrons, causing server to crash (see #44) }) minetest.register_node("digtron:loaded_locked_crate", { @@ -349,7 +352,9 @@ minetest.register_node("digtron:loaded_locked_crate", { local meta = minetest.get_meta(pos) meta:set_string("owner", "") end, - +-- can_dig = function(pos,node,player) +-- return player and not minetest.is_protected(pos, player:get_player_name()) and player_permitted(pos,player) +-- end, on_dig = function(pos, node, player) if player and not minetest.is_protected(pos, player:get_player_name()) and player_permitted(pos,player) then return loaded_on_dig(pos, player, "digtron:loaded_locked_crate") @@ -373,7 +378,8 @@ minetest.register_node("digtron:loaded_locked_crate", { "digtron:loaded_locked_crate"..minetest.pos_to_string(pos), loaded_formspec_string:gsub("${title}", meta:get_string("title"), 1)) end - end, + end, + on_drop = function(a, b, c) end -- prevent dropping loaded digtrons, causing server to crash }) minetest.register_on_player_receive_fields(function(player, formname, fields)