Merged with some local changes to TCPServer

This commit is contained in:
Obique PSWG
2017-01-30 13:16:56 -06:00
parent 31cb878fab
commit b2931b7cd4
16 changed files with 125 additions and 95 deletions
+1 -1
View File
@@ -254,7 +254,7 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
private void handleCmdSceneReady(Player player, CmdSceneReady p) {
Assert.test(player.getPlayerState() == PlayerState.ZONING_IN);
player.setPlayerState(PlayerState.ZONED_IN);
Log.i("ZoneService", "%s with character %s zoned in from %s:%d", player.getUsername(), player.getCharacterName(), p.getAddress(), p.getPort());
Log.i("ZoneService", "%s with character %s zoned in from %s", player.getUsername(), player.getCharacterName(), p.getSocketAddress());
new PlayerEventIntent(player, PlayerEvent.PE_ZONE_IN_SERVER).broadcast();
player.sendPacket(new CmdSceneReady());
}