mirror of
https://github.com/minetest-mods/item_drop.git
synced 2024-11-15 22:40:17 +01:00
Fix crash on no drops (@HybridDog)
This commit is contained in:
parent
d282d1ab0c
commit
3e6a731cab
15
init.lua
15
init.lua
|
@ -47,7 +47,7 @@ minetest.settings:get_bool("enable_item_pickup") ~= false then
|
||||||
if pickup_particle then
|
if pickup_particle then
|
||||||
local item = minetest.registered_nodes[ent.itemstring:gsub("(.*)%s.*$","%1")]
|
local item = minetest.registered_nodes[ent.itemstring:gsub("(.*)%s.*$","%1")]
|
||||||
local image = ""
|
local image = ""
|
||||||
if minetest.registered_items[item.name] and minetest.registered_items[item.name].tiles then
|
if item and minetest.registered_items[item.name] and minetest.registered_items[item.name].tiles then
|
||||||
if minetest.registered_items[item.name].tiles[1] then
|
if minetest.registered_items[item.name].tiles[1] then
|
||||||
local dt = minetest.registered_items[item.name].drawtype
|
local dt = minetest.registered_items[item.name].drawtype
|
||||||
if dt == "normal" or dt == "allfaces" or dt == "allfaces_optional"
|
if dt == "normal" or dt == "allfaces" or dt == "allfaces_optional"
|
||||||
|
@ -70,12 +70,6 @@ minetest.settings:get_bool("enable_item_pickup") ~= false then
|
||||||
if not image then image = minetest.registered_items[item.name].tiles[1] end
|
if not image then image = minetest.registered_items[item.name].tiles[1] end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
if item then
|
|
||||||
local texture = item.tiles[1] or item.inventory_image or ""
|
|
||||||
if item.drawtype == "normal" then
|
|
||||||
texture = item.tiles
|
|
||||||
end
|
|
||||||
minetest.add_particle({
|
minetest.add_particle({
|
||||||
pos = {x = pos.x, y = pos.y + 1.5, z = pos.z},
|
pos = {x = pos.x, y = pos.y + 1.5, z = pos.z},
|
||||||
velocity = {x = 0, y = 1, z = 0},
|
velocity = {x = 0, y = 1, z = 0},
|
||||||
|
@ -266,10 +260,15 @@ and not minetest.settings:get_bool("creative_mode") then
|
||||||
name = item:get_name()
|
name = item:get_name()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if name == "" then
|
||||||
|
-- Sometimes nothing should be dropped
|
||||||
|
count = 0
|
||||||
|
end
|
||||||
|
|
||||||
for _ = 1,count do
|
for _ = 1,count do
|
||||||
local obj = minetest.add_item(pos, name)
|
local obj = minetest.add_item(pos, name)
|
||||||
if not obj then
|
if not obj then
|
||||||
error("Couldn't spawn item")
|
error("Couldn't spawn item " .. name .. ", drops: " .. dump(drops))
|
||||||
end
|
end
|
||||||
|
|
||||||
local vel = obj:getvelocity()
|
local vel = obj:getvelocity()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user