diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index e7434295e2..fd451ff56a 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -74,7 +74,6 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform tree = new FileTree(); assets.setLoader(Sound.class, new SoundLoader(tree){ - @Override public void loadAsync(AssetManager manager, String fileName, Fi file, SoundParameter parameter){ @@ -109,7 +108,6 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform @Override public Music loadSync(AssetManager manager, String fileName, Fi file, MusicParameter parameter){ - if(parameter != null && parameter.music != null){ mainExecutor.submit(() -> { try{ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 9c0555a913..c5ca6ab12e 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -202,8 +202,8 @@ public class SectorPresets{ rules = r -> { r.objectives.addAll( - new BuildCountObjective(Blocks.shipFabricator, 1), - new UnitCountObjective(UnitTypes.elude, 1) + new BuildCountObjective(Blocks.shipFabricator, 1), + new UnitCountObjective(UnitTypes.elude, 1) ); }; }}; diff --git a/core/src/mindustry/entities/comp/LegsComp.java b/core/src/mindustry/entities/comp/LegsComp.java index 0fa613f1c2..a37b615e61 100644 --- a/core/src/mindustry/entities/comp/LegsComp.java +++ b/core/src/mindustry/entities/comp/LegsComp.java @@ -89,16 +89,19 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{ resetLegs(type.legLength); } - //TODO clearly broken for many units public void resetLegs(float legLength){ int count = type.legCount; this.legs = new Leg[count]; + if(type.lockLegBase){ + baseRotation = rotation; + } + for(int i = 0; i < legs.length; i++){ Leg l = new Leg(); - float dstRot = legAngle(i) + (type.lockLegBase ? rotation - baseRotation : baseRotation); + float dstRot = legAngle(i); Vec2 baseOffset = legOffset(Tmp.v5, i).add(x, y); l.joint.trns(dstRot, legLength/2f).add(baseOffset);