Merge pull request #633 from fixrtm/opposite-seat-bug

fix: sitting in the driver's seat on the opposite side drives train in reverse

CHANGELOG-SNAPSHOTS.md

@@ -18,6 +18,7 @@ The changelog for 2.0.23 and earlier is generated by [anatawa12's fork of `auto-
 ### Removed
 
 ### Fixed
+- Sitting in the driver's seat on the opposite side drives train in reverse `#633`
 
 ### Security
 

CHANGELOG.md

@@ -25,6 +25,7 @@ Thanks to prepare-changelog.sh, we have some macros.
 ### Removed
 
 ### Fixed
+- Sitting in the driver's seat on the opposite side drives train in reverse `#633`
 
 ### Security
 

src/main/rtm-patches/jp/ngt/rtm/entity/vehicle/EntityVehicleBase.java.patch

@@ -12,7 +12,7 @@
        if (axisalignedbb == null) {
           axisalignedbb = new AxisAlignedBB(-1.5D, 0.0D, -2.0D, 1.5D, 3.0D, 2.0D);
        }
-@@ -532,21 +531,33 @@
+@@ -532,21 +531,36 @@
     public void setTrainStateData(int id, byte data) {
        this.setVehicleState(TrainState.getStateType(id), data);
     }
@@ -25,6 +25,9 @@
     public void setVehicleState(TrainState.TrainStateType type, byte data) {
 -      this.getResourceState().getDataMap().setInt(type.toString(), data, 3);
 +      this.getResourceState().getDataMap().setInt(type.toString(), type.clap(data, this), 3);
++      if (type == TrainState.TrainStateType.Direction && data != getVehicleState(TrainState.TrainStateType.Direction)) {
++         setSpeed(-getSpeed());
++      }
     }
 
     @SideOnly(Side.CLIENT)