nalc/nalc_game
1
0
Fork 1
forked from minetest/minetest_game
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/carts/cart_entity.lua
View File

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

2
mods/doors/init.lua
View File

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

4
mods/player_api/api.lua
View File

@ -182,7 +182,7 @@ minetest.register_globalstep(function()
for _, player in pairs(minetest.get_connected_players()) do for _, player in pairs(minetest.get_connected_players()) do
local name = player:get_player_name() local name = player:get_player_name()
local player_data = players[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 if model and not player_attached[name] then
local controls = player:get_player_control() local controls = player:get_player_control()
local animation_speed_mod = model.animation_speed or 30 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") minetest.log("warning", api_function .. " called on offline player")
return return
end end
original_function(player, ...) return original_function(player, ...)
end end
end end

6
mods/tnt/init.lua
View File

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