From 289ab44ed52fde42a698fc12a30a0375ba970c5e Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Sep 2019 16:14:46 -0400 Subject: [PATCH] ? --- core/src/io/anuke/mindustry/entities/type/Player.java | 2 +- server/src/io/anuke/mindustry/server/ServerControl.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index fe0d501c42..745f15a4ea 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -47,7 +47,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ public float baseRotation; public float pointerX, pointerY; - public String name = "name"; + public String name = "noname"; public @Nullable String uuid, usid; public boolean isAdmin, isTransferring, isShooting, isBoosting, isMobile, isTyping; public float boostHeat, shootHeat, destructTime; diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 33c0dde34f..7129a006e6 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -814,9 +814,11 @@ public class ServerControl implements ApplicationListener{ logic.play(); state.rules = world.getMap().applyRules(lastMode); + Log.info("Player array: " + players); + for(Player p : players){ - Log.info("Iterate: " + p.name); + Log.info("Iterate thorugh: " + p); p.reset(); if(state.rules.pvp){ p.setTeam(netServer.assignTeam(p, new ArrayIterable<>(players)));