Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2025-01-09 08:39:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix cart reversal/wrong direction movement on collisions

Browse source
This commit is contained in:
teknomunk 2024-12-29 07:35:17 -06:00 committed by the-real-herowl
parent 48c380ca0b
commit 31066caf06
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mods/ENTITIES/mcl_minecarts/movement.lua
View file

@ -181,7 +181,6 @@ local function handle_cart_collision(cart1_staticdata, prev_pos, next_dir)
local m1 = cart1_staticdata.mass
local m2 = cart2_staticdata.mass
--print("u1="..tostring(u1)..",u2="..tostring(u2))
if ENABLE_TRAINS and u2 == 0 and u1 < 4 and train_length(cart1_staticdata) < MAX_TRAIN_LENGTH then
link_cart_ahead(cart1_staticdata, cart2_staticdata)
cart2_staticdata.dir = mcl_minecarts.get_rail_direction(cart2_staticdata.connected_at, cart1_staticdata.dir)
@ -189,6 +188,15 @@ local function handle_cart_collision(cart1_staticdata, prev_pos, next_dir)
return
end
-- Reverse direction of the second cart if it is pointing in the wrong direction for this collision
local rel = vector.direction(cart1_staticdata.connected_at, cart2_staticdata.connected_at)
local dir2 = cart2_staticdata.dir
local col_dir = vector.dot(rel, dir2)
if col_dir < 0 then
cart2_staticdata.dir = -dir2
u2 = -u2
end
-- Calculate new velocities according to https://en.wikipedia.org/wiki/Elastic_collision#One-dimensional_Newtonian
local c1 = m1 + m2
local d = m1 - m2
@ -197,9 +205,6 @@ local function handle_cart_collision(cart1_staticdata, prev_pos, next_dir)
cart1_staticdata.velocity = v1
cart2_staticdata.velocity = v2
-- Force the other cart to move the same direction this one was
cart2_staticdata.dir = mcl_minecarts.get_rail_direction(cart2_staticdata.connected_at, cart1_staticdata.dir)
end
local function vector_away_from_players(cart, staticdata)