diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index 8fe4eb0eff..59aac1504b 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -222,6 +222,8 @@ public class Damage{ if(scaledDamage <= 0 || tile == null) continue; + tile = tile.target(); + //apply damage to entity if needed if(tile.entity != null && tile.getTeam() != team){ int health = (int)tile.entity.health; diff --git a/core/src/io/anuke/mindustry/ui/Minimap.java b/core/src/io/anuke/mindustry/ui/Minimap.java index a931c50c73..9fb1417cd9 100644 --- a/core/src/io/anuke/mindustry/ui/Minimap.java +++ b/core/src/io/anuke/mindustry/ui/Minimap.java @@ -79,10 +79,10 @@ public class Minimap extends Container{ } super.touchDragged(event, x, y, pointer); - //if(mobile){ + if(mobile){ float max = Math.min(world.width(), world.height()) / 16f / 2f; renderer.minimap.setZoom(1f + y / height * (max - 1f)); - //} + } } @Override