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

?

Browse Source
This commit is contained in:
Anuken
2019-09-25 16:14:46 -04:00
parent 8ec465319b
commit 289ab44ed5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@@ -47,7 +47,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
public float baseRotation; public float baseRotation;
public float pointerX, pointerY; public float pointerX, pointerY;
public String name = "name"; public String name = "noname";
public @Nullable String uuid, usid; public @Nullable String uuid, usid;
public boolean isAdmin, isTransferring, isShooting, isBoosting, isMobile, isTyping; public boolean isAdmin, isTransferring, isShooting, isBoosting, isMobile, isTyping;
public float boostHeat, shootHeat, destructTime; public float boostHeat, shootHeat, destructTime;

4
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@@ -814,9 +814,11 @@ public class ServerControl implements ApplicationListener{
logic.play(); logic.play();
state.rules = world.getMap().applyRules(lastMode); state.rules = world.getMap().applyRules(lastMode);
Log.info("Player array: " + players);
for(Player p : players){ for(Player p : players){
Log.info("Iterate: " + p.name); Log.info("Iterate thorugh: " + p);
p.reset(); p.reset();
if(state.rules.pvp){ if(state.rules.pvp){
p.setTeam(netServer.assignTeam(p, new ArrayIterable<>(players))); p.setTeam(netServer.assignTeam(p, new ArrayIterable<>(players)));