projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-16 06:12:52 -04:00
Code Issues Projects Releases Wiki Activity

Reordered login packet sequence

Browse Source
This commit is contained in:
Obique PSWG
2016-04-28 10:25:26 -05:00
parent 72af851ce2
commit d294059c19
5 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/PacketType.java
+2 -2
View File
@@ -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),
src/network/packets/swg/login/ConnectionServerLagResponse.java
+1 -1
View File
@@ -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;
}
src/network/packets/swg/login/RequestExtendedClusters.java
+1 -1
View File
@@ -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() {
src/network/packets/swg/zone/GameServerLagResponse.java
+1 -1
View File
@@ -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;
}
src/services/player/LoginService.java
+1 -8
View File
@@ -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);
}