From 32d369bd653d99997488caa056c6a0d9e691be1d Mon Sep 17 00:00:00 2001 From: HybridDog Date: Sun, 31 Aug 2014 21:28:46 +0200 Subject: [PATCH 1/3] add gitignore --- .gitignore | 4 ++++ dropbox.lua | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d9c069a --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +## Generic ignorable patterns and files +*~ +.*.swp +debug.txt diff --git a/dropbox.lua b/dropbox.lua index e2b6479..5a425b2 100644 --- a/dropbox.lua +++ b/dropbox.lua @@ -34,7 +34,7 @@ minetest.register_node("more_chests:dropbox", { local inv = meta:get_inventory() return inv:is_empty("main") end, - allow_metadata_inventory_take = function(pos, listname, index, stack, player) + allow_metadata_inventory_take = function(pos, listname, index, stack, player) local meta = minetest.env:get_meta(pos) if not has_locked_chest_privilege(meta, player) then minetest.log("action", player:get_player_name().. @@ -49,11 +49,11 @@ minetest.register_node("more_chests:dropbox", { minetest.log("action", player:get_player_name().. " moves stuff in dropbox at "..minetest.pos_to_string(pos)) end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) + on_metadata_inventory_put = function(pos, listname, index, stack, player) minetest.log("action", player:get_player_name().. " moves stuff to dropbox at "..minetest.pos_to_string(pos)) end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) + on_metadata_inventory_take = function(pos, listname, index, stack, player) minetest.log("action", player:get_player_name().. " takes stuff from dropbox at "..minetest.pos_to_string(pos)) end, From 57e32a597c3ca939305000f44f8db3204f6e523d Mon Sep 17 00:00:00 2001 From: HybridDog Date: Sun, 31 Aug 2014 22:02:25 +0200 Subject: [PATCH 2/3] fix dropbox cheat --- dropbox.lua | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dropbox.lua b/dropbox.lua index 5a425b2..024bf77 100644 --- a/dropbox.lua +++ b/dropbox.lua @@ -14,13 +14,13 @@ minetest.register_node("more_chests:dropbox", { legacy_facedir_simple = true, sounds = default.node_sound_wood_defaults(), after_place_node = function(pos, placer) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) meta:set_string("owner", placer:get_player_name() or "") meta:set_string("infotext", "Dropbox (owned by ".. meta:get_string("owner")..")") end, on_construct = function(pos) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) meta:set_string("formspec", "size[8,9]".. "list[current_name;main;0,0;8,4;]".. @@ -30,12 +30,12 @@ minetest.register_node("more_chests:dropbox", { inv:set_size("main", 8*4) end, can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); + local meta = minetest.get_meta(pos); local inv = meta:get_inventory() return inv:is_empty("main") end, allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) if not has_locked_chest_privilege(meta, player) then minetest.log("action", player:get_player_name().. " tried to access a dropbox belonging to ".. @@ -45,6 +45,14 @@ minetest.register_node("more_chests:dropbox", { end return stack:get_count() end, + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + local meta = minetest.get_meta(pos) + if not has_locked_chest_privilege(meta, player) + and meta:get_inventory():get_list(listname)[index]:get_name() ~= "" then + return 0 + end + return stack:get_count() + end, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) minetest.log("action", player:get_player_name().. " moves stuff in dropbox at "..minetest.pos_to_string(pos)) From 1a5bf2eafa1f62e41cf874d4323743f11a34da1b Mon Sep 17 00:00:00 2001 From: HybridDog Date: Mon, 8 Sep 2014 11:36:43 +0200 Subject: [PATCH 3/3] update dropbox --- dropbox.lua | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dropbox.lua b/dropbox.lua index 024bf77..af99e9c 100644 --- a/dropbox.lua +++ b/dropbox.lua @@ -47,11 +47,20 @@ minetest.register_node("more_chests:dropbox", { end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) local meta = minetest.get_meta(pos) - if not has_locked_chest_privilege(meta, player) - and meta:get_inventory():get_list(listname)[index]:get_name() ~= "" then + if has_locked_chest_privilege(meta, player) then + return stack:get_count() + end + local target = meta:get_inventory():get_list(listname)[index] + local target_name = target:get_name() + local stack_count = stack:get_count() + if target_name == stack:get_name() + and target:get_count() < stack_count then + return stack_count + end + if target_name ~= "" then return 0 end - return stack:get_count() + return stack_count end, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) minetest.log("action", player:get_player_name()..