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

Removed sandbox from shuffle list / duplicate maps / mobile mech pickup

Browse Source
This commit is contained in:
Anuken
2018-10-18 18:20:07 -04:00
parent 3b58d57e5c
commit dd2c71fe61
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/entities/Player.java
+8 -3
View File
@@ -60,7 +60,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
public boolean achievedFlight;
public Color color = new Color();
public Mech mech;
public int spawner;
public int spawner = -1;
public NetConnection con;
public int playerIndex = 0;
@@ -482,6 +482,10 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
setDead(true);
}
if(netServer.isWaitingForPlayers()){
setDead(true);
}
if(isDead()){
isBoosting = false;
boostHeat = 0f;
@@ -778,7 +782,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
((SpawnerTrait) world.tile(spawner).entity).updateSpawning(this);
}else{
CoreEntity entity = (CoreEntity) getClosestCore();
if(entity != null){
if(entity != null && !netServer.isWaitingForPlayers()){
this.spawner = entity.tile.id();
}
}
@@ -859,7 +863,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
color.set(buffer.readInt());
mech = content.getByID(ContentType.mech, buffer.readByte());
int mine = buffer.readInt();
spawner = buffer.readInt();
int spawner = buffer.readInt();
float baseRotation = buffer.readShort() / 2f;
readBuilding(buffer, !isLocal);
@@ -873,6 +877,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
}else{
mining = world.tile(mine);
isBoosting = boosting;
this.spawner = spawner;
}
}