From 8b155828b70cd135ffefb1c5b140bf605e901024 Mon Sep 17 00:00:00 2001 From: Arzxq <96066999+Arzxq@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:48:06 +0800 Subject: [PATCH 1/4] Update servers_v7.json (#9110) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 6850263c8e..6301ebc442 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -242,6 +242,6 @@ }, { "name": "XuwenHost", - "address": ["106.14.14.210:6567"] + "address": ["v7.mindustru.lol:6567", "pi.xiyuchao.love:5500"] } ] From 93269692ab484621b46a27cbf2adf011084e7c5f Mon Sep 17 00:00:00 2001 From: ApsZoldat <128713348+ApsZoldat@users.noreply.github.com> Date: Fri, 29 Sep 2023 17:10:50 +0300 Subject: [PATCH 2/4] Fix marker and bridge calculation game crashes, minor marker instruction fixes (#9112) * Fix text setting in marker control * Fix marker and bridge calculation game crashes, minor marker instruction code fixes --- core/src/mindustry/game/MapObjectives.java | 10 +++++++--- core/src/mindustry/input/Placement.java | 4 ++-- core/src/mindustry/logic/LStatement.java | 2 +- core/src/mindustry/logic/LStatements.java | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java index 33d9d8451d..cef72e7971 100644 --- a/core/src/mindustry/game/MapObjectives.java +++ b/core/src/mindustry/game/MapObjectives.java @@ -32,7 +32,7 @@ public class MapObjectives implements Iterable, Eachable> allObjectiveTypes = new Seq<>(); public static final Seq> allMarkerTypes = new Seq<>(); public static final ObjectMap> markerNameToType = new ObjectMap<>(); - public static final Seq allMarkerTypeNanes = new Seq<>(); + public static final Seq allMarkerTypeNames = new Seq<>(); /** * All objectives the executor contains. Do not modify directly, ever! @@ -87,7 +87,7 @@ public class MapObjectives implements Iterable, Eachable type = prov.get().getClass(); String name = type.getSimpleName().replace("Marker", ""); - allMarkerTypeNanes.add(Strings.camelize(name)); + allMarkerTypeNames.add(Strings.camelize(name)); markerNameToType.put(name, prov); markerNameToType.put(Strings.camelize(name), prov); JsonIO.classTag(Strings.camelize(name), type); @@ -707,6 +707,9 @@ public class MapObjectives implements Iterable, Eachable, Eachable plans, ItemBridge bridge){ - if(isSidePlace(plans)) return; + if(isSidePlace(plans) || plans.size == 0) return; //check for orthogonal placement + unlocked state if(!(plans.first().x == plans.peek().x || plans.first().y == plans.peek().y) || !bridge.unlockedNow()){ @@ -176,7 +176,7 @@ public class Placement{ } public static void calculateBridges(Seq plans, DirectionBridge bridge, boolean hasJunction, Boolf same){ - if(isSidePlace(plans)) return; + if(isSidePlace(plans) || plans.size == 0) return; //check for orthogonal placement + unlocked state if(!(plans.first().x == plans.peek().x || plans.first().y == plans.peek().y) || !bridge.unlockedNow()){ diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java index 3117e91e29..418987f59f 100644 --- a/core/src/mindustry/logic/LStatement.java +++ b/core/src/mindustry/logic/LStatement.java @@ -144,7 +144,7 @@ public abstract class LStatement{ if(p instanceof Enum e){ tooltip(c, e); } - }).checked(current == p).group(group)); + }).checked(current.equals(p)).group(group)); if(++i % cols == 0) t.row(); } diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index f3e1a608fa..cb167809bc 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -1982,7 +1982,7 @@ public class LStatements{ @RegisterStatement("makemarker") public static class MakeMarkerStatement extends LStatement{ - public String id = "0", type = "Shape", x = "0", y = "0"; + public String id = "0", type = "shape", x = "0", y = "0"; @Override public void build(Table table){ @@ -1991,7 +1991,7 @@ public class LStatements{ table.button(b -> { b.label(() -> type); - b.clicked(() -> showSelect(b, MapObjectives.allMarkerTypeNanes.toArray(String.class), type, t -> { + b.clicked(() -> showSelect(b, MapObjectives.allMarkerTypeNames.toArray(String.class), type, t -> { type = t; build(table); }, 2, cell -> cell.size(160, 50))); From db9e672eb2cc9c76299de50bdbfc7c5f0ab75319 Mon Sep 17 00:00:00 2001 From: XuwenMeimei <127962617+XuwenMeimei@users.noreply.github.com> Date: Fri, 29 Sep 2023 22:27:42 +0800 Subject: [PATCH 3/4] Update servers_v7.json (#9111) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 6301ebc442..f9fea530ee 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -242,6 +242,6 @@ }, { "name": "XuwenHost", - "address": ["v7.mindustru.lol:6567", "pi.xiyuchao.love:5500"] + "address": ["v7.mindustru.lol:6567", "pi.xiyuchao.love:5500","mdt.xuwenblock.cn:6567"] } ] From dbea2e2161608143078aad13651b9b2c17dad580 Mon Sep 17 00:00:00 2001 From: meiqiu <119494143+MEIQIUawa@users.noreply.github.com> Date: Fri, 29 Sep 2023 22:40:08 +0800 Subject: [PATCH 4/4] Update servers_v7.json (#9115) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index f9fea530ee..e5e08dbe30 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,4 +1,8 @@ [ + { + "name": "meiqiuMDT", + "address": ["43.248.103.156:11023"] + }, { "name": "CMS", "address": ["195.2.84.144"]