minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix swapping class items into other invs (#670)

Browse source 
* Fix bug with team/loot chest swapping
* Fix furnace swapping
This commit is contained in:
LoneWolfHT 2020-07-21 12:18:47 -07:00 committed by GitHub
parent cb51d78a27
commit b24d1b3097
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mods/ctf/ctf_classes/items.lua
View file

@ -89,10 +89,11 @@ end)
local function protect_metadata_inventory(nodename) local function protect_metadata_inventory(nodename)
local def = assert(minetest.registered_nodes[nodename]) local def = table.copy(assert(minetest.registered_nodes[nodename]))
local old
local function wrap(defname) local function wrap(defname)
local old = def[defname] old = def[defname]
def[defname] = function(pos, listname, index, stack, player, ...) def[defname] = function(pos, listname, index, stack, player, ...)
if is_class_blacklisted(player, stack:get_name()) then if is_class_blacklisted(player, stack:get_name()) then
minetest.chat_send_player(player:get_player_name(), minetest.chat_send_player(player:get_player_name(),
@ -104,6 +105,21 @@ local function protect_metadata_inventory(nodename)
end end
end end
old = def.on_metadata_inventory_take
function def.on_metadata_inventory_take(pos, listname, index, stack, player, ...)
local furnaceinv = minetest.get_inventory({type = "node", pos = pos})
local swapped_item = furnaceinv:get_stack(listname, index)
if is_class_blacklisted(player, swapped_item:get_name()) then
furnaceinv:remove_item(listname, swapped_item)
player:get_inventory():add_item("main", swapped_item)
end
if type(old) == "function" then
return old(pos, listname, index, stack, player, ...)
end
end
wrap("allow_metadata_inventory_put") wrap("allow_metadata_inventory_put")
wrap("allow_metadata_inventory_take") wrap("allow_metadata_inventory_take")

2
mods/ctf/ctf_map/ctf_map_core/chest.lua
View file

@ -219,7 +219,7 @@ for _, chest_color in pairs(colors) do
if not ctf_map.is_item_allowed_in_team_chest(listname, swapped_item, player) then if not ctf_map.is_item_allowed_in_team_chest(listname, swapped_item, player) then
chestinv:remove_item(listname, swapped_item) chestinv:remove_item(listname, swapped_item)
player:get_inventory():add_item(listname, swapped_item) player:get_inventory():add_item("main", swapped_item)
end end
minetest.log("action", player:get_player_name() .. minetest.log("action", player:get_player_name() ..

2
mods/other/tsm_chests/init.lua
View file

@ -80,7 +80,7 @@ minetest.register_node("tsm_chests:chest", {
if swapped_item:get_name() ~= "" then if swapped_item:get_name() ~= "" then
inv:remove_item(listname, swapped_item) inv:remove_item(listname, swapped_item)
player:get_inventory():add_item(listname, swapped_item) player:get_inventory():add_item("main", swapped_item)
end end
minetest.log("action", player:get_player_name() .. minetest.log("action", player:get_player_name() ..