Mirrorlandia_minetest/digtron
1
0
Fork 0
mirror of https://github.com/minetest-mods/digtron.git synced 2024-12-22 20:32:22 +01:00
Code Issues Projects Releases Wiki Activity

Forbid dropping loaded digtron crates (see #44) (#61)

Browse Source 
* 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
This commit is contained in:
gpcf 2020-02-25 20:43:22 +01:00 committed by GitHub
parent f3d526eda7
commit c969676657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nodes/node_crate.lua
View File

@ -271,7 +271,9 @@ local loaded_on_dig = function(pos, player, loaded_node_name)
local inv = player:get_inventory() local inv = player:get_inventory()
local stack = inv:add_item("main", stack) local stack = inv:add_item("main", stack)
if stack:get_count() > 0 then 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 end
-- call on_dignodes callback -- call on_dignodes callback
minetest.remove_node(pos) minetest.remove_node(pos)
@ -333,6 +335,7 @@ minetest.register_node("digtron:loaded_crate", {
after_place_node = function(pos, placer, itemstack, pointed_thing) after_place_node = function(pos, placer, itemstack, pointed_thing)
loaded_after_place(pos, itemstack) loaded_after_place(pos, itemstack)
end, 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", { minetest.register_node("digtron:loaded_locked_crate", {
@ -349,7 +352,9 @@ minetest.register_node("digtron:loaded_locked_crate", {
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("owner", "") meta:set_string("owner", "")
end, 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) on_dig = function(pos, node, player)
if player and not minetest.is_protected(pos, player:get_player_name()) and player_permitted(pos,player) then 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") 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), "digtron:loaded_locked_crate"..minetest.pos_to_string(pos),
loaded_formspec_string:gsub("${title}", meta:get_string("title"), 1)) loaded_formspec_string:gsub("${title}", meta:get_string("title"), 1))
end 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) minetest.register_on_player_receive_fields(function(player, formname, fields)