diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index eac7325f0e..58a9ae756a 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/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(); } diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 22275a6c6c..0edd2387d0 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/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++; }); } diff --git a/servers_v6.json b/servers_v6.json index 553fde8adf..752547c0ec 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -139,4 +139,8 @@ "name": "OMNIDUSTRY", "address": ["109.94.209.233"] } + { + "name": "New Campaign Like", + "address": ["n5.yeet.ml:6568"] + }, ]