small fixes to pushing and linking distance

EternalBlueFlame · Jan 20, 2025 · 2bcba3a · 2bcba3a
1 parent 531d50c
commit 2bcba3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/train/common/api/EntityRollingStock.java b/src/main/java/train/common/api/EntityRollingStock.java
@@ -2242,7 +2242,7 @@ public boolean hasTwoLinks() {
      */
     @Override
     public float getLinkageDistance(EntityMinecart cart) {
-        return this.getOptimalDistance(cart) + 1.4F;
+        return this.getOptimalDistance(cart);
     }
 
     /**

diff --git a/src/main/java/train/common/entity/EntityHitbox.java b/src/main/java/train/common/entity/EntityHitbox.java
@@ -134,7 +134,7 @@ public void manageCollision(){
                         e.attackEntityFrom(new EntityDamageSource(
                                         host instanceof Locomotive ? "Locomotive" : "rollingstock", host),
                                 (float) (Math.abs(host.motionX) + Math.abs(host.motionZ)) * 0.5f);
-                    } else if (Math.abs(host.motionX) + Math.abs(host.motionZ) <0.01) {
+                    } else if (Math.abs(host.motionX) + Math.abs(host.motionZ) <0.05) {
                         double[] motion = CommonUtil.rotatePoint(0.05, 0,
                                 CommonUtil.atan2degreesf( host.posZ- e.posZ, host.posX-e.posX));
                         host.addVelocity(motion[0], 0, motion[2]);