Mirrorlandia_minetest/item_drop
1
0
Fork 0
mirror of https://github.com/minetest-mods/item_drop.git synced 2024-12-22 05:42:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix error when picking up a node with deprecated tile definition (#40)

Browse Source 
If `image` instead of `tile` was used, the mod passed nil to minetest.inventorycube.
The color field of a tile is now also supported (the code is used only for the particle image calculation).
This commit is contained in:
HybridDog 2022-10-06 18:36:50 +02:00 committed by GitHub
parent d19d00d690
commit 8bebf6324e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
init.lua
View File

@ -93,6 +93,27 @@ if legacy_setting_getbool("item_drop.enable_item_pickup",
flowingliquid = true, flowingliquid = true,
} }
-- Get an image string from a tile definition
local function tile_to_image(tile, fallback_image)
if not tile then
return fallback_image
end
local tile_type = type(tile)
if tile_type == "string" then
return tile
end
assert(tile_type == "table", "Tile definition is not a string or table")
local image = tile.name or tile.image
assert(image, "Tile definition has no image file specified")
if tile.color then
local colorstr = minetest.colorspec_to_colorstring(tile.color)
if colorstr then
return image .. "^[multiply:" .. colorstr
end
end
return image
end
-- adds the item to the inventory and removes the object -- adds the item to the inventory and removes the object
local function collect_item(ent, pos, player) local function collect_item(ent, pos, player)
item_drop.before_collect(ent, pos, player) item_drop.before_collect(ent, pos, player)
@ -107,20 +128,11 @@ if legacy_setting_getbool("item_drop.enable_item_pickup",
if item and item.tiles and item.tiles[1] then if item and item.tiles and item.tiles[1] then
if inventorycube_drawtypes[item.drawtype] then if inventorycube_drawtypes[item.drawtype] then
local tiles = item.tiles local tiles = item.tiles
-- color in the tile definition is handled by tile_to_image.
local top = tiles[1] -- color in the node definition is not yet supported here.
if type(top) == "table" then local top = tile_to_image(tiles[1])
top = top.name local left = tile_to_image(tiles[3], top)
end local right = tile_to_image(tiles[5], left)
local left = tiles[3] or top
if type(left) == "table" then
left = left.name
end
local right = tiles[5] or left
if type(right) == "table" then
right = right.name
end
image = minetest.inventorycube(top, left, right) image = minetest.inventorycube(top, left, right)
else else
image = item.inventory_image or item.tiles[1] image = item.inventory_image or item.tiles[1]