diff --git a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java index 6909d470e5..dd9ab983ed 100644 --- a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java @@ -244,12 +244,14 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ @Override public void update(){ - hitTime -= Time.delta(); - if(isDead()){ + //dead enemies should get immediately removed + remove(); return; } + hitTime -= Time.delta(); + if(Net.client()){ interpolate(); status.update(this); diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java index 612af596eb..81b3ecf97b 100644 --- a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java @@ -80,7 +80,7 @@ public class MinimapRenderer implements Disposable{ for(Unit unit : units){ float rx = (unit.x - rect.x) / rect.width * w, ry = (unit.y - rect.y) / rect.width * h; Draw.color(unit.getTeam().color); - Fill.rect(x + rx, y + ry, baseSize / 2f, baseSize / 2f); + Fill.rect(x + rx, y + ry, io.anuke.arc.scene.ui.layout.Unit.dp.scl(baseSize / 2f), io.anuke.arc.scene.ui.layout.Unit.dp.scl(baseSize / 2f)); } Draw.color(); diff --git a/gradle.properties b/gradle.properties index 4d9ca8856d..7e937afc9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -#TODO set to true on release; see if it fixes things +#TODO set to true on release; see if it fixes things: #android.enableD8.desugaring=false \ No newline at end of file