Merge remote-tracking branch 'upstream/stable-5' into dev

This commit is contained in:
bri cassa 2022-07-17 00:44:14 +02:00
commit 7588085a09
4 changed files with 7 additions and 7 deletions

View File

@ -398,7 +398,7 @@ minetest.register_craftitem("carts:cart", {
pointed_thing) or itemstack
end
if not pointed_thing.type == "node" then
if pointed_thing.type ~= "node" then
return
end
if carts:is_rail(pointed_thing.under) then

View File

@ -260,7 +260,7 @@ function doors.register(name, def)
on_place = function(itemstack, placer, pointed_thing)
local pos
if not pointed_thing.type == "node" then
if pointed_thing.type ~= "node" then
return itemstack
end

View File

@ -182,7 +182,7 @@ minetest.register_globalstep(function()
for _, player in pairs(minetest.get_connected_players()) do
local name = player:get_player_name()
local player_data = players[name]
local model = models[player_data.model]
local model = player_data and models[player_data.model]
if model and not player_attached[name] then
local controls = player:get_player_control()
local animation_speed_mod = model.animation_speed or 30
@ -218,6 +218,6 @@ for _, api_function in pairs({"get_animation", "set_animation", "set_model", "se
minetest.log("warning", api_function .. " called on offline player")
return
end
original_function(player, ...)
return original_function(player, ...)
end
end

View File

@ -243,9 +243,9 @@ local function add_effects(pos, radius, drops)
local def = minetest.registered_nodes[name]
if def then
node = { name = name }
end
if def and def.tiles and def.tiles[1] then
texture = def.tiles[1]
if def.tiles and type(def.tiles[1]) == "string" then
texture = def.tiles[1]
end
end
end
end