mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 08:57:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2023-09-18 23:19:03 -04:00
commit a7ba018dc3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/game/SpawnGroup.java
View File

@ -128,7 +128,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
String tname = data.getString("type", "dagger"); String tname = data.getString("type", "dagger");
type = content.unit(LegacyIO.unitMap.get(tname, tname)); 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); begin = data.getInt("begin", 0);
end = data.getInt("end", never); end = data.getInt("end", never);
spacing = data.getInt("spacing", 1); spacing = data.getInt("spacing", 1);

6
servers_v7.json
View File

@ -1,4 +1,8 @@
[ [
{
"name": "ShardDustry",
"address": ["srv3.godlike.club:30561", "65.109.65.23:5552"]
},
{ {
"name": "Tamazia", "name": "Tamazia",
"address": ["213.165.76.25:6567", "213.165.76.25:30104"] "address": ["213.165.76.25:6567", "213.165.76.25:30104"]
@ -194,7 +198,7 @@
}, },
{ {
"name": "Cyandustry", "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", "name": "Four Family",