drag, collision, and linking fixes

Author: EternalBlueFlame

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

@@ -107,10 +107,10 @@ public void onUpdate() {
 	@Override
 	protected void updateFuelTrain(int amount) {
 		//reduceExplosionChance = 1000;
-		if (fuelTrain < 0) {
+		if (fuelTrain < 1 || !this.isLocoTurnedOn()) {
 			//hasUranium = false;
-			motionX *= 0.8;
-			motionZ *= 0.8;
+			motionX *= 0.55;
+			motionZ *= 0.55;
 		}
 		else {
 			if(this.isLocoTurnedOn()) {

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

@@ -2391,8 +2391,8 @@ public void moveMinecartOnRail(int i, int j, int k, double d) {
             motionX *= 0.99D;
             motionZ *= 0.99D;
         } else {
-            motionX *= 1D;
-            motionZ *= 1D;
+            motionX *= 0.9D;
+            motionZ *= 0.9D;
         }
         if (motionX < -maxSpeed) {
             motionX = -maxSpeed;

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

@@ -801,22 +801,22 @@ public void onUpdate()
                 motionZ *= 0.98;
             }
         }
-        if (getState().equals("warm")) {
+        else if (getState().equals("warm")) {
             this.extinguish();
             if (getCurrentMaxSpeed() >= (getMaxSpeed() * 0.7)) {
                 motionX *= 0.94;
                 motionZ *= 0.94;
             }
         }
-        if (getState().equals("hot")) {
+        else if (getState().equals("hot")) {
             this.extinguish();
         }
-        if (getState().equals("too hot")) {
+        else if (getState().equals("too hot")) {
             motionX *= 0.95;
             motionZ *= 0.95;
             worldObj.spawnParticle("largesmoke", posX, posY + 0.3, posZ, 0.0D, 0.0D, 0.0D);
         }
-        if (getState().equals("broken")) {
+        else if (getState().equals("broken")) {
             setFire(8);
             this.setCustomSpeed(0);// set speed to normal
             this.setAccel(0.000001);// simulate a break down

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

@@ -94,34 +94,29 @@ public void manageCollision(){
             } else {
                 if (e instanceof CollisionBox) {
                     if(((CollisionBox) e).host==null){
-                        return;
+                        continue;
                     }
                     EntityRollingStock entityOne = (((CollisionBox) e).host);
                     if (entityOne.isAttaching && host.isAttaching) {
-                        if(entityOne instanceof Locomotive && host instanceof Locomotive){
-                            if(entityOne.canBeAdjusted(null) || host.canBeAdjusted(null)){
-                                LinkHandler.addStake(host, entityOne, true);
-                                LinkHandler.addStake(entityOne, host, true);
-                            } else {
-                                EntityPlayer p = host.getWorld().getClosestPlayerToEntity(host,32);
-                                if(p!=null){
-                                    p.addChatComponentMessage(new ChatComponentText("One or more trains is not in towing mode."));
-                                    p.addChatComponentMessage(new ChatComponentText("Use a Stake while sneaking to toggle towing mode."));
-                                }
-                            }
-                        } else {
+                        if(entityOne.canBeAdjusted(host) || host.canBeAdjusted(entityOne)){
                             LinkHandler.addStake(host, entityOne, true);
                             LinkHandler.addStake(entityOne, host, true);
+                        } else {
+                            EntityPlayer p = host.getWorld().getClosestPlayerToEntity(host,32);
+                            if(p!=null){
+                                p.addChatComponentMessage(new ChatComponentText("One or more trains is not in towing mode."));
+                                p.addChatComponentMessage(new ChatComponentText("Use a Stake while sneaking to toggle towing mode."));
+                            }
                         }
-                        return;
-                    }
-                    double[] motion = CommonUtil.rotatePoint(0.005, 0,
-                            CommonUtil.atan2degreesf(e.posZ - host.posZ, e.posX - host.posX));
-                    host.addVelocity(-motion[0], 0, -motion[2]);
-                    if(entityOne instanceof Locomotive) {
-                        entityOne.addVelocity(motion[0]*0.2, 0, motion[2]*0.2);
                     } else {
-                        entityOne.addVelocity(motion[0], 0, motion[2]);
+                        double[] motion = CommonUtil.rotatePoint(0.005, 0,
+                                CommonUtil.atan2degreesf(e.posZ - host.posZ, e.posX - host.posX));
+                        host.addVelocity(-motion[0], 0, -motion[2]);
+                        if (entityOne instanceof Locomotive) {
+                            entityOne.addVelocity(motion[0] * 0.2, 0, motion[2] * 0.2);
+                        } else {
+                            entityOne.addVelocity(motion[0], 0, motion[2]);
+                        }
                     }
 
                 } else if (e instanceof EntityPlayer || e instanceof EntityLiving) {