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

More testing

Browse Source
This commit is contained in:
Anuken
2019-09-25 16:23:37 -04:00
parent 289ab44ed5
commit 48bf88f99d
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,11 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
private Vector2 movement = new Vector2(); private Vector2 movement = new Vector2();
private boolean moved; private boolean moved;
{
RuntimeException e = new RuntimeException("player " + name);
Core.app.post(e::printStackTrace);
}
//endregion //endregion
//region unit and event overrides, utility methods //region unit and event overrides, utility methods
@@ -254,7 +259,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
@Override @Override
public String toString(){ public String toString(){
return "Player{" + id + ", mech=" + mech.name + ", local=" + isLocal + ", " + x + ", " + y + "}"; return "Player{" + name + ", mech=" + mech.name + ", id=" + id + ", local=" + isLocal + ", " + x + ", " + y + "}";
} }
@Override @Override

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

@@ -799,14 +799,14 @@ public class ServerControl implements ApplicationListener{
private void play(boolean wait, Runnable run){ private void play(boolean wait, Runnable run){
inExtraRound = true; inExtraRound = true;
Runnable r = () -> { Runnable r = () -> {
Array<Player> players = new Array<>(); Array<Player> players = new Array<>();
Log.info("Players: " + playerGroup.all());
for(Player p : playerGroup.all()){ for(Player p : playerGroup.all()){
players.add(p); players.add(p);
p.setDead(true); p.setDead(true);
} }
Log.info("Group contents:\n{0}\n{1}\n\n", players, playerGroup.all());
logic.reset(); logic.reset();
Call.onWorldDataBegin(); Call.onWorldDataBegin();
@@ -814,11 +814,9 @@ 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); Log.info("Group contents post:\n{0}\n{1}\n\n", players, playerGroup.all());
for(Player p : players){ for(Player p : players){
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)));