Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-17 00:21:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into chat-command-builder-2

Browse source
This commit is contained in:
AFCMS 2021-07-06 11:07:18 +02:00
commit a65acd3ab8
4 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mods/ENTITIES/mcl_falling_nodes/init.lua
View file

@ -19,7 +19,10 @@ local function deal_falling_damage(self, dtime)
end end
self._hit = self._hit or {} self._hit = self._hit or {}
for _, obj in ipairs(minetest.get_objects_inside_radius(pos, 1)) do for _, obj in ipairs(minetest.get_objects_inside_radius(pos, 1)) do
if mcl_util.get_hp(obj) > 0 and not self._hit[obj] then local entity = obj:get_luaentity()
if entity and entity.name == "__builtin:item" then
obj:remove()
elseif mcl_util.get_hp(obj) > 0 and not self._hit[obj] then
self._hit[obj] = true self._hit[obj] = true
local way = self._startpos.y - pos.y local way = self._startpos.y - pos.y
local damage = (way - 1) * 2 local damage = (way - 1) * 2

2
mods/ITEMS/mcl_banners/init.lua
View file

@ -573,7 +573,7 @@ for colorid, colortab in pairs(mcl_banners.colors) do
end, end,
}) })
if mod_mcl_core and minetest.get_modpath("mcl_wool") then if mod_mcl_core and minetest.get_modpath("mcl_wool") and pattern_name == "" then
minetest.register_craft({ minetest.register_craft({
output = itemstring, output = itemstring,
recipe = { recipe = {

13
mods/ITEMS/mcl_banners/patterncraft.lua
View file

@ -8,9 +8,6 @@ local N = function(s) return s end
-- Maximum number of layers which can be put on a banner by crafting. -- Maximum number of layers which can be put on a banner by crafting.
local max_layers_crafting = 12 local max_layers_crafting = 12
-- Maximum number of layers when banner includes a gradient (workaround, see below).
local max_layers_gradient = 3
-- Max. number lines in the descriptions for the banner layers. -- Max. number lines in the descriptions for the banner layers.
-- This is done to avoid huge tooltips. -- This is done to avoid huge tooltips.
local max_layer_lines = 6 local max_layer_lines = 6
@ -398,16 +395,6 @@ local function banner_pattern_craft(itemstack, player, old_craft_grid, craft_inv
if #layers >= max_layers_crafting then if #layers >= max_layers_crafting then
return ItemStack("") return ItemStack("")
end end
-- Lower layer limit when banner includes any gradient.
-- Workaround to circumvent Minetest bug (https://github.com/minetest/minetest/issues/6210)
-- TODO: Remove this restriction when bug #6210 is fixed.
if #layers >= max_layers_gradient then
for l=1, #layers do
if layers[l].pattern == "gradient" or layers[l].pattern == "gradient_up" then
return ItemStack("")
end
end
end
local matching_pattern local matching_pattern
local max_i = player:get_inventory():get_size("craft") local max_i = player:get_inventory():get_size("craft")

2
mods/ITEMS/mcl_core/nodes_base.lua
View file

@ -1041,7 +1041,7 @@ for i=1,8 do
drop = "mcl_throwing:snowball "..(i+1), drop = "mcl_throwing:snowball "..(i+1),
_mcl_blast_resistance = 0.1, _mcl_blast_resistance = 0.1,
_mcl_hardness = 0.1, _mcl_hardness = 0.1,
_mcl_silk_touch_drop = {"mcl_core:snow " .. (i+1)}, _mcl_silk_touch_drop = {"mcl_core:snow " .. i},
}) })
end end