linking still not fixed, but sorta closer

Author: EternalBlueFlame

src/main/java/train/common/api/EntityBogie.java

@@ -270,6 +270,8 @@ else if (TCRailTypes.isStraightTrack(lastTrack)) {
 		} else if (TCRailTypes.isDiagonalTrack(lastTrack) || TCRailTypes.isDiagonalCrossingTrack(lastTrack)){
 			moveOnTCDiagonal(j);
 		}
+		velocity[2]=0;
+		velocity[3]=0;
 
 	}
 
@@ -516,6 +518,8 @@ public void addLinking(AbstractTrains host, double speed){
 
 		velocity[2]+=speed*velocity[4];
 		velocity[3]+=speed*velocity[5];
+		velocity[4]=0;
+		velocity[5]=0;
 	}
 
 	public void drag(AbstractTrains host, double drag){

src/main/java/train/common/api/EntityRollingStock.java

@@ -971,10 +971,6 @@ public void updatePosition(){
                 prevPosZ = posZ;
 
                 ticksSinceLastVelocityChange=1;
-
-                cachedVectors[1]= new Vec3f(rotationPoints()[0], 0, 0).rotatePoint(0, rotationYaw, 0)
-                        .addVector(posX,0,posZ);
-                bogieFront.setPosition(cachedVectors[1].xCoord, bogieFront.posY,cachedVectors[1].zCoord);
             } else {
                 motionX = (posX - prevPosX)/ticksSinceLastVelocityChange;
                 motionZ = (posZ - prevPosZ)/ticksSinceLastVelocityChange;
@@ -1010,7 +1006,7 @@ public void addLinkingMove(double velocity){
         bogieBack.addLinking(this, velocity);
         bogieFront.addLinking(this, velocity);
     }
-    public void manageLink(AbstractTrains other) {
+    public void manageLink(EntityRollingStock other) {
         if(isLocoTurnedOn || other.bogieBack ==null || other.bogieFront ==null || bogieBack ==null || bogieFront ==null) {
             return;
         }
@@ -1021,6 +1017,7 @@ public void manageLink(AbstractTrains other) {
 
         double springDist = MathHelper.sqrt_double(vecX * vecX + vecZ * vecZ)
                 -(getOptimalDistance(other)+other.getOptimalDistance(this));
+        springDist*=0.0625;
 
         if(getVelocity()>0.3) {
             springDist *= 0.45;
@@ -1029,14 +1026,13 @@ public void manageLink(AbstractTrains other) {
         } else {
             springDist*=0.3;
         }
-        if(backLink!=null && other == backLink) {
+        if(backLink!=null && other.getEntityId() == backLink.getEntityId()) {
             springDist *= -1;
         }
 
         if(Math.abs(springDist)>0.01) {
             addLinkingMove(springDist);
         }
-
     }
 
     /**
@@ -1045,11 +1041,11 @@ public void manageLink(AbstractTrains other) {
     public void finalMove(){
 
         applyDrag();
-        if(frontLink!=null) {
-            manageLink(frontLink);
+        if(frontLink instanceof EntityRollingStock) {
+            manageLink((EntityRollingStock) frontLink);
         }
-        if(backLink!=null){
-            manageLink(backLink);
+        if(backLink instanceof EntityRollingStock){
+            manageLink((EntityRollingStock) backLink);
         }
 
         applyDrag();

src/main/java/train/common/api/Locomotive.java

@@ -930,14 +930,6 @@ else if (getState().equals("broken")) {
         }
     }
 
-    @Override
-    public void manageLink(AbstractTrains other){
-        if(forwardPressed || backwardPressed){
-            return;
-        }
-        super.manageLink(other);
-    }
-
     @Override
     public boolean isAccelerating(){return forwardPressed || backwardPressed;}
 

src/main/java/train/common/entity/EntityHitbox.java

@@ -2,6 +2,7 @@
 
 import ebf.tim.entities.EntitySeat;
 import ebf.tim.utility.CommonUtil;
+import ebf.tim.utility.DebugUtil;
 import fexcraft.tmt.slim.Vec3d;
 import fexcraft.tmt.slim.Vec3f;
 import net.minecraft.entity.Entity;
@@ -192,7 +193,7 @@ public void updateCollidingEntities(EntityRollingStock host){
                     for (List olist: entities) {
                         for(Object obj : olist) {
                             //this shouldn't be possible, but it's forge, sooooo....
-                            if(!(obj instanceof Entity)){
+                            if(!(obj instanceof Entity) || interactionBoxes.contains(obj)){
                                 continue;
                             }
 
@@ -201,7 +202,7 @@ public void updateCollidingEntities(EntityRollingStock host){
                             //If the cart is in a consist containing a locomotive, we do not want to push it.
                             if (!ConfigHandler.PUSHABLE_ROLLINGSTOCK || host instanceof Locomotive || (host.consistLeadID != null && host.worldObj.getEntityByID(host.consistLeadID) instanceof Locomotive)) {
                                 //still need to push the player back though
-                                if (containsEntity((Entity)obj)) {
+                                if (obj instanceof EntityLiving && containsEntity((Entity)obj)) {
                                     ((Entity)obj).applyEntityCollision(host);
                                 }
                                 continue;
@@ -226,7 +227,7 @@ public void updateCollidingEntities(EntityRollingStock host){
                                 }
                                 boolean skip=false;
                                 for(AbstractTrains t: host.consist) {
-                                    if(t.getEntityId()==host.getEntityId()){
+                                    if(t.getEntityId()==((CollisionBox) obj).host.getEntityId()){
                                         skip=true;
                                     }
                                 }