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

Run callbacks based on validated inventory

Browse Source
This commit is contained in:
stujones11 2018-05-23 20:15:09 +01:00
parent 7d30bc25a3
commit 83f3e01efa
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
3d_armor/api.lua
View File

@ -481,12 +481,28 @@ armor.save_armor_inventory = function(self, player)
if not name then if not name then
return return
end end
local armor_list = {}
local armor_list_string = player:get_attribute("3d_armor_inventory")
if armor_list_string then
for i, item in pairs(minetest.deserialize(armor_list_string)) do
armor_list[item] = item ~= "" and i or nil
end
end
-- Workaround for detached inventory swap exploit
local elements = {} local elements = {}
local player_inv = player:get_inventory() local player_inv = player:get_inventory()
for i = 1, 6 do for i = 1, 6 do
local stack = inv:get_stack("armor", i) local stack = inv:get_stack("armor", i)
local element = self:get_element(stack:get_name()) if stack:get_count() > 0 then
local item = stack:get_name()
local element = self:get_element(item)
if element and not elements[element] then if element and not elements[element] then
if armor_list[item] then
armor_list[item] = nil
else
-- Item was not in previous inventory
armor:run_callbacks("on_equip", player, i, stack)
end
elements[element] = true; elements[element] = true;
else else
inv:remove_item("armor", stack) inv:remove_item("armor", stack)
@ -495,6 +511,12 @@ armor.save_armor_inventory = function(self, player)
end end
end end
end end
end
for item, i in pairs(armor_list) do
local stack = ItemStack(item)
-- Previous item is not in current inventory
armor:run_callbacks("on_unequip", player, i, stack)
end
player:set_attribute("3d_armor_inventory", player:set_attribute("3d_armor_inventory",
self:serialize_inventory_list(inv:get_list("armor"))) self:serialize_inventory_list(inv:get_list("armor")))
end end

6
3d_armor/init.lua
View File

@ -118,12 +118,10 @@ local function init_player_armor(player)
local armor_inv = minetest.create_detached_inventory(name.."_armor", { local armor_inv = minetest.create_detached_inventory(name.."_armor", {
on_put = function(inv, listname, index, stack, player) on_put = function(inv, listname, index, stack, player)
armor:save_armor_inventory(player) armor:save_armor_inventory(player)
armor:run_callbacks("on_equip", player, index, stack)
armor:set_player_armor(player) armor:set_player_armor(player)
end, end,
on_take = function(inv, listname, index, stack, player) on_take = function(inv, listname, index, stack, player)
armor:save_armor_inventory(player) armor:save_armor_inventory(player)
armor:run_callbacks("on_unequip", player, index, stack)
armor:set_player_armor(player) armor:set_player_armor(player)
end, end,
on_move = function(inv, from_list, from_index, to_list, to_index, count, player) on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
@ -132,11 +130,9 @@ local function init_player_armor(player)
end, end,
allow_put = function(inv, listname, index, put_stack, player) allow_put = function(inv, listname, index, put_stack, player)
local element = armor:get_element(put_stack:get_name()) local element = armor:get_element(put_stack:get_name())
if not element then if not element then
return 0 return 0
end end
for i = 1, 6 do for i = 1, 6 do
local stack = inv:get_stack("armor", i) local stack = inv:get_stack("armor", i)
local def = stack:get_definition() or {} local def = stack:get_definition() or {}
@ -167,8 +163,10 @@ local function init_player_armor(player)
end end
for i=1, 6 do for i=1, 6 do
local stack = armor_inv:get_stack("armor", i) local stack = armor_inv:get_stack("armor", i)
if stack:get_count() > 0 then
armor:run_callbacks("on_equip", player, i, stack) armor:run_callbacks("on_equip", player, i, stack)
end end
end
armor.def[name] = { armor.def[name] = {
init_time = minetest.get_gametime(), init_time = minetest.get_gametime(),
level = 0, level = 0,