From 6f9b7122306201888d62febb7fc50837c11ba071 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 1 Jun 2018 18:35:14 -0400 Subject: [PATCH] Fixed trail appearing behind player mech --- core/src/io/anuke/mindustry/entities/Player.java | 4 +++- core/src/io/anuke/mindustry/input/DesktopInput.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 171a4ec91c..b450e454e6 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -255,7 +255,9 @@ public class Player extends Unit implements BlockBuilder { drawBuilding(this); } - trail.draw(Palette.lighterOrange, Palette.lightishOrange, 5f); + if(isFlying()){ + trail.draw(Palette.lighterOrange, Palette.lightishOrange, 5f); + } } public void drawName(){ diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index c6a8cf3469..5b244565c8 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -62,7 +62,7 @@ public class DesktopInput extends InputHandler{ @Override public boolean isDrawing(){ - return mode != none; + return mode != none || recipe != null; } @Override @@ -167,7 +167,7 @@ public class DesktopInput extends InputHandler{ @Override public boolean touchDown (int screenX, int screenY, int pointer, int button) { - if(player.isDead() || state.is(State.menu) || ui.hasDialog()) return false; + if(player.isDead() || state.is(State.menu) || ui.hasDialog() || ui.hasMouse()) return false; Tile cursor = tileAt(screenX, screenY); if(cursor == null) return false;