MTSR/techage
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept mincart carts for the move controller

Browse Source
This commit is contained in:
Joachim Stolberg 2023-02-05 19:34:08 +01:00
parent 46d2ae91aa
commit c95e3e7b50
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
basis/fly_lib.lua
View File

@ -50,7 +50,7 @@ local function set_node(item, playername)
nvm.running = false nvm.running = false
M(item.base_pos):set_string("status", S("Stopped")) M(item.base_pos):set_string("status", S("Stopped"))
if ndef1 and ndef2 then if ndef1 and ndef2 then
if minecart.is_cart(name) then if minecart.is_cart(name) and minecart.is_rail(dest_pos, node.name) then
local player = playername and minetest.get_player_by_name(playername) local player = playername and minetest.get_player_by_name(playername)
minecart.place_and_start_cart(dest_pos, {name = name, param2 = param2}, item.cartdef, player) minecart.place_and_start_cart(dest_pos, {name = name, param2 = param2}, item.cartdef, player)
return return
@ -548,6 +548,9 @@ local function is_valid_dest(pos)
if techage.is_air_like(node.name) then if techage.is_air_like(node.name) then
return true return true
end end
if minecart.is_rail(pos, node.name) then
return true
end
if not M(pos):contains("ta_move_block") then if not M(pos):contains("ta_move_block") then
return true return true
end end
@ -556,7 +559,7 @@ end
local function is_simple_node(pos) local function is_simple_node(pos)
local node = techage.get_node_lvm(pos) local node = techage.get_node_lvm(pos)
if not minecart.is_rail(pos, node) then if not minecart.is_rail(pos, node.name) then
local ndef = minetest.registered_nodes[node.name] local ndef = minetest.registered_nodes[node.name]
return not techage.is_air_like(node.name) and techage.can_dig_node(node.name, ndef) or minecart.is_cart(node.name) return not techage.is_air_like(node.name) and techage.can_dig_node(node.name, ndef) or minecart.is_cart(node.name)
end end
@ -580,7 +583,7 @@ local function move_node(pos, meta, pos1, lmove, max_speed, height)
if obj then if obj then
if is_cart then if is_cart then
attach_objects(pos1, 0, obj, yoffs, {x = 0, y = -0.2, z = 0}) attach_objects(pos1, 0, obj, yoffs, {x = 0, y = -0.4, z = 0})
else else
local offs = {x=0, y=height or 1, z=0} local offs = {x=0, y=height or 1, z=0}
attach_objects(pos1, offs, obj, yoffs) attach_objects(pos1, offs, obj, yoffs)