Less hacky support for atrocious json

2019-11-22 15:33:01 -05:00
parent 2c61fcdfa6
commit 6d6fac00d7
6 changed files with 14 additions and 27 deletions
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -345,7 +345,7 @@ public class HudFragment extends Fragment{

    @Remote(targets = Loc.both, forward = true, called = Loc.both)
    public static void setPlayerTeamEditor(Player player, Team team){
-        if(state.isEditor()){
+        if(state.isEditor() && player != null){
            player.setTeam(team);
        }
    }