From 698e4bc74041f373662afe90bbd97dae0df43849 Mon Sep 17 00:00:00 2001 From: Darkness6030 <79508138+Darkness6030@users.noreply.github.com> Date: Sun, 6 Jun 2021 21:23:43 +0300 Subject: [PATCH 1/4] Domain for mindurka (#5380) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 265d294f65..7cfe275d04 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -89,7 +89,7 @@ }, { "name": "MD Community", - "address": ["46.17.104.254", "46.17.104.254:4000"] + "address": ["mindurka.tk", "mindurka.tk:4000"] }, { "name": "Mindustry.Party", From 0859f92fea8826b7d4c7b465e79d7db21fce9794 Mon Sep 17 00:00:00 2001 From: Darkness6030 <79508138+Darkness6030@users.noreply.github.com> Date: Sun, 6 Jun 2021 21:23:52 +0300 Subject: [PATCH 2/4] Domain for mindurka (#5381) --- servers_be.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_be.json b/servers_be.json index 00d82b09bc..6fcc7a4a4f 100644 --- a/servers_be.json +++ b/servers_be.json @@ -12,7 +12,7 @@ "address": "mindustry.pl:7777" }, { - "address": "46.17.104.254:9999" + "address": "mindurka.tk:9999" }, { "address": "mindustrypvp.ml:6000" From 45f5e2ae90d1c4146f47069773a2936d3e8f4e48 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Sun, 6 Jun 2021 14:25:17 -0400 Subject: [PATCH 3/4] remove stray newline (#5386) --- core/src/mindustry/content/Weathers.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java index ee89e4f82c..262c38475b 100644 --- a/core/src/mindustry/content/Weathers.java +++ b/core/src/mindustry/content/Weathers.java @@ -117,5 +117,4 @@ public class Weathers implements ContentList{ baseSpeed = 0.03f; }}; } - } From faa8c68c202710ddbb6fde2bf14001d1c01f63b3 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Sun, 6 Jun 2021 14:50:56 -0400 Subject: [PATCH 4/4] remove space & extra backets (#5384) * remove space * remove extra brackets --- core/src/mindustry/input/InputHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index cb4ebad970..1ea2433660 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -108,7 +108,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ if(build == null || build.items == null) return; build.items.set(item, amount); } - + @Remote(called = Loc.server, unreliable = true) public static void clearItems(Building build){ if(build == null || build.items == null) return; @@ -938,9 +938,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ //check if tapped block is configurable if(build.block.configurable && build.interactable(player.team())){ consumed = true; - if(((!frag.config.isShown() && build.shouldShowConfigure(player)) //if the config fragment is hidden, show + if((!frag.config.isShown() && build.shouldShowConfigure(player)) //if the config fragment is hidden, show //alternatively, the current selected block can 'agree' to switch config tiles - || (frag.config.isShown() && frag.config.getSelectedTile().onConfigureTileTapped(build)))){ + || (frag.config.isShown() && frag.config.getSelectedTile().onConfigureTileTapped(build))){ Sounds.click.at(build); frag.config.showConfig(build); }