From fb724514f3723b68085ca48d152cb3247c95b72c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 29 Apr 2019 11:27:15 -0400
Subject: [PATCH] Fixed portrait custom game dialog

---
 core/src/io/anuke/mindustry/editor/EditorTile.java       | 2 +-
 core/src/io/anuke/mindustry/entities/traits/Entity.java  | 9 +++------
 .../io/anuke/mindustry/ui/dialogs/CustomGameDialog.java  | 3 ++-
 server/src/io/anuke/mindustry/server/ServerControl.java  | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/src/io/anuke/mindustry/editor/EditorTile.java b/core/src/io/anuke/mindustry/editor/EditorTile.java
index 839466eaa6..1af8d2ffe8 100644
--- a/core/src/io/anuke/mindustry/editor/EditorTile.java
+++ b/core/src/io/anuke/mindustry/editor/EditorTile.java
@@ -36,7 +36,7 @@ public class EditorTile extends Tile{
         Block ore = overlay();
         if(previous == type && ore == Blocks.air) return;
         super.setFloor(type);
-        //ore may get nullified so make sure to save editrs
+        //ore may get nullified so make sure to save edits
         if(overlay() != ore){
             op(TileOp.get(x, y, (byte)OpType.ore.ordinal(), ore.id, overlay().id));
         }
diff --git a/core/src/io/anuke/mindustry/entities/traits/Entity.java b/core/src/io/anuke/mindustry/entities/traits/Entity.java
index a98257cf77..2de8e0e013 100644
--- a/core/src/io/anuke/mindustry/entities/traits/Entity.java
+++ b/core/src/io/anuke/mindustry/entities/traits/Entity.java
@@ -8,14 +8,11 @@ public interface Entity extends MoveTrait{
 
     void resetID(int id);
 
-    default void update(){
-    }
+    default void update(){}
 
-    default void removed(){
-    }
+    default void removed(){}
 
-    default void added(){
-    }
+    default void added(){}
 
     EntityGroup targetGroup();
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
index 06edc28521..e7c6829cb0 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
@@ -9,6 +9,7 @@ import io.anuke.arc.scene.ui.ImageButton;
 import io.anuke.arc.scene.ui.ScrollPane;
 import io.anuke.arc.scene.ui.TextButton;
 import io.anuke.arc.scene.ui.layout.Table;
+import io.anuke.arc.scene.utils.UIUtils;
 import io.anuke.arc.util.Align;
 import io.anuke.arc.util.Scaling;
 import io.anuke.mindustry.game.Difficulty;
@@ -43,7 +44,7 @@ public class CustomGameDialog extends FloatingDialog{
         ScrollPane pane = new ScrollPane(maps);
         pane.setFadeScrollBars(false);
 
-        int maxwidth = (Core.graphics.getHeight() > Core.graphics.getHeight() ? 2 : 4);
+        int maxwidth = (UIUtils.portrait() ? 2 : 4);
 
         Table selmode = new Table();
         ButtonGroup<TextButton> group = new ButtonGroup<>();
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 91d5211133..5dcd013dac 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -100,7 +100,7 @@ public class ServerControl implements ApplicationListener{
 
             if(args.length > 0){
                 commands = Strings.join(" ", args).split(",");
-                info("&lmFound {0} command-line arguments to parse. {1}", commands.length);
+                info("&lmFound {0} command-line arguments to parse.", commands.length);
             }
 
             for(String s : commands){