nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-02-04 14:20:16 +01:00
Code Issues Releases Wiki Activity

remove armors drop, replaced by bones mod soon

Browse Source 
fix crash in unified_inventory, on join if died, detached inventory is nil
This commit is contained in:
crabman77 2017-01-24 18:31:10 +01:00
parent 06a1153d25
commit 2cb3a70846
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mods/3d_armor/3d_armor/armor.lua
View File

@ -545,7 +545,7 @@ minetest.register_on_joinplayer(function(player)
end, player) end, player)
end end
end) end)
--[[
if ARMOR_DROP == true or ARMOR_DESTROY == true then if ARMOR_DROP == true or ARMOR_DESTROY == true then
armor.drop_armor = function(pos, stack) armor.drop_armor = function(pos, stack)
local obj = minetest.add_item(pos, stack) local obj = minetest.add_item(pos, stack)
@ -602,6 +602,7 @@ if ARMOR_DROP == true or ARMOR_DESTROY == true then
end end
end) end)
end end
--]]
minetest.register_on_player_hpchange(function(player, hp_change) minetest.register_on_player_hpchange(function(player, hp_change)
local name, player_inv, armor_inv = armor:get_valid_player(player, "[on_hpchange]") local name, player_inv, armor_inv = armor:get_valid_player(player, "[on_hpchange]")

6
mods/unified_inventory/bags.lua
View File

@ -311,7 +311,11 @@ function unified_inventory.extract_bag(player, id)
end end
pinv:remove_item("bag" .. id, stack) pinv:remove_item("bag" .. id, stack)
minetest.get_inventory({type = "detached", name = minetest.formspec_escape(player:get_player_name()) .. "_bags"}):set_stack("bag" .. id, 1, nil) local dinv = minetest.get_inventory({type = "detached", name = minetest.formspec_escape(player:get_player_name()) .. "_bags"})
if dinv then
dinv:set_stack("bag" .. id, 1, nil)
end
pinv:set_list("bag" .. id .. "contents", {}) pinv:set_list("bag" .. id .. "contents", {})
stack:set_metadata(minetest.serialize(list)) stack:set_metadata(minetest.serialize(list))