From 4ff8e05755e7560e4c15bce170122545a468150b Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 26 Nov 2019 15:49:36 +0100 Subject: Fix trains not stopping when colliding with environment H#122 --- advtrains/wagons.lua | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua index 8ff1d7e..4f84fc0 100644 --- a/advtrains/wagons.lua +++ b/advtrains/wagons.lua @@ -419,17 +419,10 @@ function wagon:on_step(dtime) end end if collides then - if self.collision_count and self.collision_count>10 then - --enable collision mercy to get trains stuck in walls out of walls - --actually do nothing except limiting the velocity to 1 - train.velocity=math.min(train.velocity, 1) - else - train.recently_collided_with_env=true - train.velocity=0 - self.collision_count=(self.collision_count or 0)+1 - end - else - self.collision_count=nil + -- screw collision mercy + train.recently_collided_with_env=true + train.velocity=0 + advtrains.atc.train_reset_command(train) end end -- cgit v1.2.3