Fix #148 (for real this time)

railcraft-reborn · Nov 21, 2023 · 7b9628c · 7b9628c
1 parent e1c45fe
commit 7b9628c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/mods/railcraft/world/entity/vehicle/locomotive/Locomotive.java b/src/main/java/mods/railcraft/world/entity/vehicle/locomotive/Locomotive.java
@@ -494,6 +494,10 @@ public final void whistle() {
   public void tick() {
     super.tick();
 
+    if (this.isRemoved()) {
+      return;
+    }
+
     if (this.level().isClientSide()) {
       if (Seasons.isPolarExpress(this)
           && (!MathUtil.nearZero(this.getDeltaMovement().x())
@@ -545,10 +549,14 @@ private void processTicket() {
 
   @Override
   protected void applyNaturalSlowdown() {
+    if (this.isRemoved()) {
+      return;
+    }
+
     this.setDeltaMovement(this.getDeltaMovement().multiply(getDrag(), 0.0D, getDrag()));
 
     if (this.isReverse() && this.getSpeed().getLevel() > this.getMaxReverseSpeed().getLevel()) {
-      setSpeed(getMaxReverseSpeed());
+      this.setSpeed(this.getMaxReverseSpeed());
     }
 
     var speed = this.getSpeed();