From 68d51c1770327d54b4a7f13d675bf48a38146ef2 Mon Sep 17 00:00:00 2001 From: NazrinNya <137837419+NazrinNya@users.noreply.github.com> Date: Sat, 16 Sep 2023 22:43:23 +0300 Subject: [PATCH 1/3] Update server_v7.json (#9063) * Update servers_v7.json * Update servers_v7.json --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 7635564f89..ace7a65214 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -194,7 +194,7 @@ }, { "name": "Cyandustry", - "address": ["n1.mindustry.me:7000","n1.mindustry.me:7500", "n1.mindustry.me:7600"] + "address": ["91.218.66.162:8000","91.218.66.162:7000", "91.218.66.162:7500", "91.218.66.162:7600"] }, { "name": "Four Family", From a1061059abfebd4118b90f83978c5e36d0fe2147 Mon Sep 17 00:00:00 2001 From: Arksource <93954648+ArkSourcer@users.noreply.github.com> Date: Sat, 16 Sep 2023 16:23:48 -0400 Subject: [PATCH 2/3] Update servers_v7.json (#9064) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index ace7a65214..4d879db733 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,4 +1,8 @@ [ + { + "name": "ShardDustry", + "address": ["srv3.godlike.club:30561", "65.109.65.23:5552"] + }, { "name": "Tamazia", "address": ["213.165.76.25:6567", "213.165.76.25:30104"] From 2b93d39e725fb1268e6397ddd482db8b0c5ed9e8 Mon Sep 17 00:00:00 2001 From: WayZer Date: Sun, 17 Sep 2023 12:22:04 +0800 Subject: [PATCH 3/3] Update SpawnGroup.java (#9065) --- core/src/mindustry/game/SpawnGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/game/SpawnGroup.java b/core/src/mindustry/game/SpawnGroup.java index 0b2aea3bc4..aa2657fc9c 100644 --- a/core/src/mindustry/game/SpawnGroup.java +++ b/core/src/mindustry/game/SpawnGroup.java @@ -128,7 +128,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{ String tname = data.getString("type", "dagger"); type = content.unit(LegacyIO.unitMap.get(tname, tname)); - if(type == null) type = UnitTypes.dagger; + if(type == null || type.internal) type = UnitTypes.dagger; begin = data.getInt("begin", 0); end = data.getInt("end", never); spacing = data.getInt("spacing", 1);