Fixed core-less editor gameover, respawning
This commit is contained in:
@@ -194,7 +194,7 @@ public class Logic implements ApplicationListener{
|
|||||||
world.pathfinder.update();
|
world.pathfinder.update();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!Net.client() && !world.isInvalidMap()){
|
if(!Net.client() && !world.isInvalidMap() && !state.isEditor()){
|
||||||
checkGameOver();
|
checkGameOver();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -239,6 +239,8 @@ public class MapEditorDialog extends Dialog implements Disposable{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
player.set(world.width() * tilesize/2f, world.height() * tilesize/2f);
|
||||||
|
player.setDead(false);
|
||||||
logic.play();
|
logic.play();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -790,7 +790,11 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
|
|||||||
|
|
||||||
public void updateRespawning(){
|
public void updateRespawning(){
|
||||||
|
|
||||||
if(spawner != null && spawner.isValid()){
|
if(state.isEditor()){
|
||||||
|
//instant respawn at center of map.
|
||||||
|
set(world.width() * tilesize/2f, world.height() * tilesize/2f);
|
||||||
|
setDead(false);
|
||||||
|
}else if(spawner != null && spawner.isValid()){
|
||||||
spawner.updateSpawning(this);
|
spawner.updateSpawning(this);
|
||||||
}else if(!netServer.isWaitingForPlayers()){
|
}else if(!netServer.isWaitingForPlayers()){
|
||||||
if(!Net.client()){
|
if(!Net.client()){
|
||||||
@@ -806,16 +810,11 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void beginRespawning(SpawnerTrait spawner){
|
public void beginRespawning(SpawnerTrait spawner){
|
||||||
if(state.isEditor()){
|
|
||||||
dead = false;
|
|
||||||
set(spawner.getX(), spawner.getY());
|
|
||||||
}else{
|
|
||||||
this.spawner = spawner;
|
this.spawner = spawner;
|
||||||
this.lastSpawner = spawner;
|
this.lastSpawner = spawner;
|
||||||
this.dead = true;
|
this.dead = true;
|
||||||
setNet(spawner.getX(), spawner.getY());
|
setNet(spawner.getX(), spawner.getY());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
//endregion
|
//endregion
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user