diff --git a/FFXIVClassic Lobby Server/PacketProcessor.cs b/FFXIVClassic Lobby Server/PacketProcessor.cs index 8ccbbf08..c4f27e85 100644 --- a/FFXIVClassic Lobby Server/PacketProcessor.cs +++ b/FFXIVClassic Lobby Server/PacketProcessor.cs @@ -90,14 +90,15 @@ namespace FFXIVClassic_Lobby_Server if (userId == 0) { - ErrorPacket errorPacket = new ErrorPacket(sessionPacket.sequence, 0, 0, 13001, "Your session has expired, please login again."); - SubPacket subpacket = errorPacket.BuildPacket(); - BasePacket errorBasePacket = BasePacket.CreatePacket(subpacket, true, false); - BasePacket.EncryptPacket(client.blowfish, errorBasePacket); - client.QueuePacket(errorBasePacket); + ErrorPacket errorPacket = new ErrorPacket(sessionPacket.sequence, 0, 0, 13001, "Your session has expired, please login again."); + SubPacket subpacket = errorPacket.BuildPacket(); + subpacket.SetTargetId(0xe0006868); + BasePacket errorBasePacket = BasePacket.CreatePacket(subpacket, true, false); + BasePacket.EncryptPacket(client.blowfish, errorBasePacket); + client.QueuePacket(errorBasePacket); - Program.Log.Info("Invalid session, kicking..."); - return; + Program.Log.Info("Invalid session, kicking..."); + return; } Program.Log.Info("USER ID: {0}", userId); diff --git a/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs b/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs index a6c69341..2ec17d81 100644 --- a/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs @@ -61,7 +61,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); accountCount = 0; } @@ -88,7 +89,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); } diff --git a/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs b/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs index 5825c7be..31c9a882 100644 --- a/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs @@ -59,7 +59,7 @@ namespace FFXIVClassic_Lobby_Server.packets binWriter.Dispose(); memStream.Dispose(); - return new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + return new SubPacket(OPCODE, 0xe0006868, data); } } } diff --git a/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs b/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs index 42db777f..bceeac8c 100644 --- a/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs @@ -87,7 +87,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); characterCount = 0; } @@ -133,7 +134,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); characterCount = 0; } @@ -145,7 +147,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); } diff --git a/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs b/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs index 5578ee52..621732d3 100644 --- a/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs @@ -38,7 +38,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); return subpacket; } } diff --git a/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs b/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs index ac389071..ffb3a9cd 100644 --- a/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs @@ -64,7 +64,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); namesCount = 0; } @@ -91,7 +92,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); } diff --git a/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs b/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs index c9a6377d..fc7e6122 100644 --- a/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs @@ -65,7 +65,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); retainerCount = 0; } @@ -92,7 +93,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); } diff --git a/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs b/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs index 6b57da3f..35686caa 100644 --- a/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs @@ -49,7 +49,8 @@ namespace FFXIVClassic_Lobby_Server.packets data = memStream.GetBuffer(); } - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); return subPackets; diff --git a/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs b/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs index 0e939700..86e4712a 100644 --- a/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs +++ b/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs @@ -63,7 +63,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); serverCount = 0; } @@ -90,7 +91,8 @@ namespace FFXIVClassic_Lobby_Server.packets byte[] data = memStream.GetBuffer(); binWriter.Dispose(); memStream.Dispose(); - SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, 0xe0006868, data); + SubPacket subpacket = new SubPacket(OPCODE, 0xe0006868, data); + subpacket.SetTargetId(0xe0006868); subPackets.Add(subpacket); }