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 experimental

Browse Source
This commit is contained in:
bri cassa 2022-05-27 18:12:56 +02:00
commit 93c1287cf1
4 changed files with 6 additions and 6 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

2
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

4
mods/tnt/init.lua
View File

@ -243,12 +243,12 @@ 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
minetest.add_particlespawner({ minetest.add_particlespawner({
amount = 64, amount = 64,