From d294059c19e2b19de4bed1c34c8d64c4370a93bf Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Thu, 28 Apr 2016 10:25:26 -0500 Subject: [PATCH] Reordered login packet sequence --- src/network/PacketType.java | 4 ++-- .../packets/swg/login/ConnectionServerLagResponse.java | 2 +- .../packets/swg/login/RequestExtendedClusters.java | 2 +- src/network/packets/swg/zone/GameServerLagResponse.java | 2 +- src/services/player/LoginService.java | 9 +-------- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/network/PacketType.java b/src/network/PacketType.java index c0732dd27..8f345d796 100644 --- a/src/network/PacketType.java +++ b/src/network/PacketType.java @@ -71,7 +71,7 @@ public enum PacketType { REQUEST_EXTENDED_CLUSTERS (RequestExtendedClusters.CRC, RequestExtendedClusters.class), OFFLINE_SERVERS_MESSAGE (OfflineServersMessage.CRC, OfflineServersMessage.class), SERVER_NOW_EPOCH_TIME (ServerNowEpochTime.CRC, ServerNowEpochTime.class), - CONNECTION_SERVER_LAG_RESPONSE (ConnectionServerLagResponse.CRC,ConnectionServerLagResponse.class), + GAME_SERVER_LAG_RESPONSE (GameServerLagResponse.CRC, GameServerLagResponse.class), // Post-Login LOGIN_CLIENT_ID (LoginClientId.CRC, LoginClientId.class), @@ -97,7 +97,7 @@ public enum PacketType { DELETE_CHARACTER_REQUEST (DeleteCharacterRequest.CRC, DeleteCharacterRequest.class), // Zone - GAME_SERVER_LAG_RESPONSE (GameServerLagResponse.CRC, GameServerLagResponse.class), + CONNECTION_SERVER_LAG_RESPONSE (ConnectionServerLagResponse.CRC, ConnectionServerLagResponse.class), COMMAND_QUEUE_ENQUEUE (0x00000116, CommandQueueEnqueue.class), SELECT_CHARACTER (SelectCharacter.CRC, SelectCharacter.class), CMD_SCENE_READY (CmdSceneReady.CRC, CmdSceneReady.class), diff --git a/src/network/packets/swg/login/ConnectionServerLagResponse.java b/src/network/packets/swg/login/ConnectionServerLagResponse.java index 60b55fe34..af39ff453 100644 --- a/src/network/packets/swg/login/ConnectionServerLagResponse.java +++ b/src/network/packets/swg/login/ConnectionServerLagResponse.java @@ -47,7 +47,7 @@ public class ConnectionServerLagResponse extends SWGPacket { public ByteBuffer encode() { ByteBuffer data = ByteBuffer.allocate(6); - addShort(data, 2); + addShort(data, 1); addInt( data, CRC); return data; } diff --git a/src/network/packets/swg/login/RequestExtendedClusters.java b/src/network/packets/swg/login/RequestExtendedClusters.java index b70094814..8c71cf930 100644 --- a/src/network/packets/swg/login/RequestExtendedClusters.java +++ b/src/network/packets/swg/login/RequestExtendedClusters.java @@ -34,7 +34,7 @@ import network.packets.swg.SWGPacket; public class RequestExtendedClusters extends SWGPacket { - public static final int CRC = 0x8E33ED05; + public static final int CRC = resources.common.CRC.getCrc("RequestExtendedClusterInfo"); public RequestExtendedClusters() { diff --git a/src/network/packets/swg/zone/GameServerLagResponse.java b/src/network/packets/swg/zone/GameServerLagResponse.java index 606f882be..37fa8f0ce 100644 --- a/src/network/packets/swg/zone/GameServerLagResponse.java +++ b/src/network/packets/swg/zone/GameServerLagResponse.java @@ -47,7 +47,7 @@ public class GameServerLagResponse extends SWGPacket { public ByteBuffer encode() { ByteBuffer data = ByteBuffer.allocate(6); - addShort(data, 2); + addShort(data, 1); addInt( data, CRC); return data; } diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java index ea123d5ef..2c2f0a453 100644 --- a/src/services/player/LoginService.java +++ b/src/services/player/LoginService.java @@ -40,10 +40,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import main.ProjectSWG; import network.packets.Packet; import network.packets.swg.ErrorMessage; -import network.packets.swg.ServerUnixEpochTime; import network.packets.swg.login.CharacterCreationDisabled; import network.packets.swg.login.EnumerateCharacterId; import network.packets.swg.login.EnumerateCharacterId.SWGCharacter; @@ -54,8 +52,6 @@ import network.packets.swg.login.LoginClientToken; import network.packets.swg.login.LoginClusterStatus; import network.packets.swg.login.LoginEnumCluster; import network.packets.swg.login.LoginIncorrectClientId; -import network.packets.swg.login.OfflineServersMessage; -import network.packets.swg.login.StationIdHasJediSlot; import network.packets.swg.zone.GameServerLagResponse; import network.packets.swg.zone.LagRequest; import network.packets.swg.zone.ServerNowEpochTime; @@ -263,15 +259,12 @@ public class LoginService extends Service { clusterStatus.addGalaxy(g); } cluster.setMaxCharacters(getConfig(ConfigFile.PRIMARY).getInt("GALAXY-MAX-CHARACTERS", 2)); - sendPacket(p.getNetworkId(), new ServerUnixEpochTime((int) (ProjectSWG.getCoreTime() / 1000))); sendPacket(p.getNetworkId(), new ServerNowEpochTime((int)(System.currentTimeMillis()/1E3))); sendPacket(p.getNetworkId(), token); sendPacket(p.getNetworkId(), cluster); - sendPacket(p.getNetworkId(), new OfflineServersMessage()); sendPacket(p.getNetworkId(), new CharacterCreationDisabled()); - sendPacket(p.getNetworkId(), clusterStatus); - sendPacket(p.getNetworkId(), new StationIdHasJediSlot(0)); sendPacket(p.getNetworkId(), new EnumerateCharacterId(characters)); + sendPacket(p.getNetworkId(), clusterStatus); p.setPlayerState(PlayerState.LOGGED_IN); }