mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2024-12-25 02:00:37 +01:00
fix crash server dropondie
Thank you Le_Docteur for this fix !
This commit is contained in:
parent
b4b484ad95
commit
947e74ad59
@ -1,20 +1,20 @@
|
|||||||
local drop = function(pos, itemstack)
|
local drop = function(pos, itemstack)
|
||||||
|
|
||||||
local it = itemstack:take_item(itemstack:get_count())
|
local it = itemstack:take_item(itemstack:get_count())
|
||||||
local obj = core.add_item(pos, it)
|
local obj = core.add_item(pos, it)
|
||||||
|
|
||||||
if obj then
|
if obj then
|
||||||
|
|
||||||
obj:setvelocity({x=math.random(-1,1), y=5, z=math.random(-1,1)})
|
obj:setvelocity({x=math.random(-1,1), y=5, z=math.random(-1,1)})
|
||||||
|
|
||||||
local remi = minetest.setting_get("remove_items")
|
local remi = minetest.setting_get("remove_items")
|
||||||
|
|
||||||
if remi and remi == "true" then
|
if remi and remi == "true" then
|
||||||
obj:remove()
|
obj:remove()
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_on_dieplayer(function(player)
|
minetest.register_on_dieplayer(function(player)
|
||||||
@ -38,17 +38,17 @@ minetest.register_on_dieplayer(function(player)
|
|||||||
for i=1,player_inv:get_size("craft") do
|
for i=1,player_inv:get_size("craft") do
|
||||||
drop(pos, player_inv:get_stack("craft", i))
|
drop(pos, player_inv:get_stack("craft", i))
|
||||||
player_inv:set_stack("craft", i, nil)
|
player_inv:set_stack("craft", i, nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Drop unified_inventory bags and their contents
|
-- Drop unified_inventory bags and their contents
|
||||||
if minetest.get_modpath("unified_inventory") then
|
if minetest.get_modpath("unified_inventory") then
|
||||||
|
|
||||||
local bag_id = {"bag1"}
|
local bag_id = {"bag1", "bag2", "bag3", "bag4"}
|
||||||
local contents_id = ""
|
local contents_id = ""
|
||||||
local n = 0
|
local n = 0
|
||||||
|
|
||||||
for n = 1, 4 do
|
for n = 1, 4 do
|
||||||
if player_inv:get_size(bag_id[n]) == 1 then
|
if player_inv:get_size(bag_id[n]) ~= nil and player_inv:get_size(bag_id[n]) == 1 then
|
||||||
contents_id = bag_id[n].."contents"
|
contents_id = bag_id[n].."contents"
|
||||||
-- Drop the contents of the bag (but keep the bag itself)
|
-- Drop the contents of the bag (but keep the bag itself)
|
||||||
for i = 1, player_inv:get_size(contents_id) do
|
for i = 1, player_inv:get_size(contents_id) do
|
||||||
@ -58,60 +58,7 @@ minetest.register_on_dieplayer(function(player)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
if minetest.get_modpath("unified_inventory") then
|
|
||||||
|
|
||||||
local bag_id = {"bag2"}
|
|
||||||
local contents_id = ""
|
|
||||||
local n = 0
|
|
||||||
|
|
||||||
for n = 1, 4 do
|
|
||||||
if player_inv:get_size(bag_id[n]) == 1 then
|
|
||||||
contents_id = bag_id[n].."contents"
|
|
||||||
-- Drop the contents of the bag (but keep the bag itself)
|
|
||||||
for i = 1, player_inv:get_size(contents_id) do
|
|
||||||
-- Drop a clone of this item's stack and remove the one from the inventory
|
|
||||||
drop(pos, player_inv:get_stack(contents_id, i))
|
|
||||||
player_inv:set_stack(contents_id, i, nil)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if minetest.get_modpath("unified_inventory") then
|
|
||||||
|
|
||||||
local bag_id = {"bag3"}
|
|
||||||
local contents_id = ""
|
|
||||||
local n = 0
|
|
||||||
|
|
||||||
for n = 1, 4 do
|
|
||||||
if player_inv:get_size(bag_id[n]) == 1 then
|
|
||||||
contents_id = bag_id[n].."contents"
|
|
||||||
-- Drop the contents of the bag (but keep the bag itself)
|
|
||||||
for i = 1, player_inv:get_size(contents_id) do
|
|
||||||
-- Drop a clone of this item's stack and remove the one from the inventory
|
|
||||||
drop(pos, player_inv:get_stack(contents_id, i))
|
|
||||||
player_inv:set_stack(contents_id, i, nil)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if minetest.get_modpath("unified_inventory") then
|
|
||||||
|
|
||||||
local bag_id = {"bag4"}
|
|
||||||
local contents_id = ""
|
|
||||||
local n = 0
|
|
||||||
|
|
||||||
for n = 1, 4 do
|
|
||||||
if player_inv:get_size(bag_id[n]) == 1 then
|
|
||||||
contents_id = bag_id[n].."contents"
|
|
||||||
-- Drop the contents of the bag (but keep the bag itself)
|
|
||||||
for i = 1, player_inv:get_size(contents_id) do
|
|
||||||
-- Drop a clone of this item's stack and remove the one from the inventory
|
|
||||||
drop(pos, player_inv:get_stack(contents_id, i))
|
|
||||||
player_inv:set_stack(contents_id, i, nil)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
117
mods/dropondie/init.lua~
Normal file
117
mods/dropondie/init.lua~
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
local drop = function(pos, itemstack)
|
||||||
|
|
||||||
|
local it = itemstack:take_item(itemstack:get_count())
|
||||||
|
local obj = core.add_item(pos, it)
|
||||||
|
|
||||||
|
if obj then
|
||||||
|
|
||||||
|
obj:setvelocity({x=math.random(-1,1), y=5, z=math.random(-1,1)})
|
||||||
|
|
||||||
|
local remi = minetest.setting_get("remove_items")
|
||||||
|
|
||||||
|
if remi and remi == "true" then
|
||||||
|
obj:remove()
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
|
||||||
|
minetest.register_on_dieplayer(function(player)
|
||||||
|
|
||||||
|
if minetest.setting_getbool("creative_mode") then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local pos = player:getpos()
|
||||||
|
pos.y = math.floor(pos.y + 0.5)
|
||||||
|
|
||||||
|
minetest.chat_send_player(player:get_player_name(), 'at '..math.floor(pos.x)..','..math.floor(pos.y)..','..math.floor(pos.z))
|
||||||
|
|
||||||
|
local player_inv = player:get_inventory()
|
||||||
|
|
||||||
|
for i=1,player_inv:get_size("main") do
|
||||||
|
drop(pos, player_inv:get_stack("main", i))
|
||||||
|
player_inv:set_stack("main", i, nil)
|
||||||
|
end
|
||||||
|
|
||||||
|
for i=1,player_inv:get_size("craft") do
|
||||||
|
drop(pos, player_inv:get_stack("craft", i))
|
||||||
|
player_inv:set_stack("craft", i, nil)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Drop unified_inventory bags and their contents
|
||||||
|
if minetest.get_modpath("unified_inventory") then
|
||||||
|
|
||||||
|
local bag_id = {"bag1"}
|
||||||
|
local contents_id = ""
|
||||||
|
local n = 0
|
||||||
|
|
||||||
|
for n = 1, 4 do
|
||||||
|
if player_inv:get_size(bag_id[n]) ~= nil and player_inv:get_size(bag_id[n] == 1) then
|
||||||
|
contents_id = bag_id[n].."contents"
|
||||||
|
-- Drop the contents of the bag (but keep the bag itself)
|
||||||
|
for i = 1, player_inv:get_size(contents_id) do
|
||||||
|
-- Drop a clone of this item's stack and remove the one from the inventory
|
||||||
|
drop(pos, player_inv:get_stack(contents_id, i))
|
||||||
|
player_inv:set_stack(contents_id, i, nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if minetest.get_modpath("unified_inventory") then
|
||||||
|
|
||||||
|
local bag_id = {"bag2"}
|
||||||
|
local contents_id = ""
|
||||||
|
local n = 0
|
||||||
|
|
||||||
|
for n = 1, 4 do
|
||||||
|
if player_inv:get_size(bag_id[n]) ~= nil and player_inv:get_size(bag_id[n] == 1) then
|
||||||
|
contents_id = bag_id[n].."contents"
|
||||||
|
-- Drop the contents of the bag (but keep the bag itself)
|
||||||
|
for i = 1, player_inv:get_size(contents_id) do
|
||||||
|
-- Drop a clone of this item's stack and remove the one from the inventory
|
||||||
|
drop(pos, player_inv:get_stack(contents_id, i))
|
||||||
|
player_inv:set_stack(contents_id, i, nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if minetest.get_modpath("unified_inventory") then
|
||||||
|
|
||||||
|
local bag_id = {"bag3"}
|
||||||
|
local contents_id = ""
|
||||||
|
local n = 0
|
||||||
|
|
||||||
|
for n = 1, 4 do
|
||||||
|
if player_inv:get_size(bag_id[n]) ~= nil and player_inv:get_size(bag_id[n] == 1) then
|
||||||
|
contents_id = bag_id[n].."contents"
|
||||||
|
-- Drop the contents of the bag (but keep the bag itself)
|
||||||
|
for i = 1, player_inv:get_size(contents_id) do
|
||||||
|
-- Drop a clone of this item's stack and remove the one from the inventory
|
||||||
|
drop(pos, player_inv:get_stack(contents_id, i))
|
||||||
|
player_inv:set_stack(contents_id, i, nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if minetest.get_modpath("unified_inventory") then
|
||||||
|
|
||||||
|
local bag_id = {"bag4"}
|
||||||
|
local contents_id = ""
|
||||||
|
local n = 0
|
||||||
|
|
||||||
|
for n = 1, 4 do
|
||||||
|
if player_inv:get_size(bag_id[n]) ~= nil and player_inv:get_size(bag_id[n] == 1) then
|
||||||
|
contents_id = bag_id[n].."contents"
|
||||||
|
-- Drop the contents of the bag (but keep the bag itself)
|
||||||
|
for i = 1, player_inv:get_size(contents_id) do
|
||||||
|
-- Drop a clone of this item's stack and remove the one from the inventory
|
||||||
|
drop(pos, player_inv:get_stack(contents_id, i))
|
||||||
|
player_inv:set_stack(contents_id, i, nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end)
|
Loading…
Reference in New Issue
Block a user