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

Fixed crashes with team IDs above 127

Browse Source
This commit is contained in:
Anuken
2020-07-03 12:36:12 -04:00
parent 3772b04c6b
commit 843a8c3e56
18 changed files with 48 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/io/SaveVersion.java
+2 -2
View File
@@ -98,7 +98,7 @@ public abstract class SaveVersion extends SaveFileReader{
"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(),
"playerteam", player == null ? state.rules.defaultTeam.uid : player.team().uid
"playerteam", player == null ? state.rules.defaultTeam.id : player.team().id
).merge(tags));
}
@@ -119,7 +119,7 @@ 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));
Team team = Team.get(map.getInt("playerteam", state.rules.defaultTeam.id));
if(!net.client() && team != Team.derelict){
player.team(team);
}