From 6a406f4d456be7002ab65a92dc1d72a212b87f80 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 24 Apr 2019 22:18:00 -0400 Subject: [PATCH] Removed SolidTrait#movable --- core/src/io/anuke/mindustry/entities/traits/SolidTrait.java | 4 ---- core/src/io/anuke/mindustry/entities/type/Unit.java | 5 ----- 2 files changed, 9 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java b/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java index 9321c6fcc1..4553627b3c 100644 --- a/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java @@ -25,10 +25,6 @@ public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, En return getY() - lastPosition().y; } - default boolean movable(){ - return false; - } - default boolean collides(SolidTrait other){ return true; } diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/io/anuke/mindustry/entities/type/Unit.java index a4866b7484..cb73e7b437 100644 --- a/core/src/io/anuke/mindustry/entities/type/Unit.java +++ b/core/src/io/anuke/mindustry/entities/type/Unit.java @@ -55,11 +55,6 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ protected Team team = Team.blue; protected float drownTime, hitTime; - @Override - public boolean movable(){ - return !isDead(); - } - @Override public boolean collidesGrid(int x, int y){ return !isFlying();