Merge branch 'master' of https://github.com/Anuken/Mindustry

core/src/mindustry/type/UnitType.java

@@ -1181,10 +1181,6 @@ public class UnitType extends UnlockableContent{
             drawShield(unit);
         }
 
-        if(mech != null){
-            unit.trns(-legOffset.x, -legOffset.y);
-        }
-
         //TODO how/where do I draw under?
         if(parts.size > 0){
             for(int i = 0; i < parts.size; i++){
@@ -1212,6 +1208,10 @@ public class UnitType extends UnlockableContent{
             }
         }
 
+        if(mech != null){
+            unit.trns(-legOffset.x, -legOffset.y);
+        }
+
         Draw.reset();
     }
 

core/src/mindustry/type/Weapon.java

@@ -408,12 +408,12 @@ public class Weapon implements Cloneable{
         }
 
         shoot.shoot(mount.totalShots, (xOffset, yOffset, angle, delay, mover) -> {
+            mount.totalShots++;
             if(delay > 0f){
                 Time.run(delay, () -> bullet(unit, mount, xOffset, yOffset, angle, mover));
             }else{
                 bullet(unit, mount, xOffset, yOffset, angle, mover);
             }
-            mount.totalShots++;
         });
     }