Fixed bugs with player list, rturret description and deserialization

This commit is contained in:
Anuken
2018-01-30 22:11:54 -05:00
parent 9a5ac76850
commit 0c4f3dc612
10 changed files with 240 additions and 210 deletions
@@ -62,7 +62,7 @@ public class Player extends SyncEntity{
return false;
}
}
return super.collides(other) && !isAndroid;
return !isDead() && super.collides(other) && !isAndroid;
}
@Override
@@ -92,6 +92,7 @@ public class Player extends SyncEntity{
Timers.run(respawnduration + 5f, () -> {
heal();
set(world.getSpawnX(), world.getSpawnY());
interpolator.target.set(x, y);
});
}