Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More intelligent suicide units / Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-06-06 11:36:14 -04:00
parent 1e3a190d5a
commit 0f76aeba05
9 changed files with 144 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/io/SaveVersion.java
View File

@@ -90,7 +90,8 @@ public abstract class SaveVersion extends SaveFileReader{
"height", world.height(),
"viewpos", Tmp.v1.set(player == null ? Vec2.ZERO : player).toString(),
"controlledType", headless || control.input.controlledType == null ? "null" : control.input.controlledType.name,
"nocores", state.rules.defaultTeam.cores().isEmpty()
"nocores", state.rules.defaultTeam.cores().isEmpty(),
"playerteam", player == null ? state.rules.defaultTeam.uid : player.team().uid
).merge(tags));
}
@@ -111,6 +112,10 @@ public abstract class SaveVersion extends SaveFileReader{
player.set(Tmp.v1);
control.input.controlledType = content.getByName(ContentType.unit, map.get("controlledType", "<none>"));
Team team = Team.get(map.getInt("playerteam", state.rules.defaultTeam.uid));
if(!net.client() && team != Team.derelict){
player.team(team);
}
}
Map worldmap = maps.byName(map.get("mapname", "\\\\\\"));