From fda2ed8b4193b023cd82ea0d9460bf5976a9f7ba Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 6 Nov 2020 13:34:57 -0500 Subject: [PATCH] Cleanup --- core/src/mindustry/editor/MapEditorDialog.java | 4 ++-- .../world/blocks/defense/turrets/TractorBeamTurret.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index fc96184ec4..91927a0630 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -681,7 +681,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ search.image(Icon.zoom).padRight(8); search.field("", this::rebuildBlockSelection) .name("editor/search").maxTextLength(maxNameLength).get().setMessageText("@players.search"); - }).pad(5); + }).pad(-2); cont.row(); cont.table(Tex.underline, extra -> extra.labelWrap(() -> editor.drawBlock.localizedName).width(200f).center()).growX(); cont.row(); @@ -730,7 +730,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ } if(i == 0){ - blockSelection.add("@none").padLeft(80f).padTop(10f); + blockSelection.add("@none").color(Color.lightGray).padLeft(80f).padTop(10f); } } } diff --git a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java index 2250275298..92856f6709 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java @@ -6,6 +6,7 @@ import arc.math.*; import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; +import mindustry.content.*; import mindustry.entities.*; import mindustry.gen.*; import mindustry.graphics.*; @@ -102,7 +103,7 @@ public class TractorBeamTurret extends BaseTurret{ } if(status != StatusEffects.none){ - target.apply(status, statusDuration) + target.apply(status, statusDuration); } //shoot when possible