Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed PlayerConnectPacket() from client to server and small bug fixed

Browse Source
This commit is contained in:
EntenKoeniq
2021-12-17 23:02:53 +01:00
parent c77e2a0287
commit 5cfbaaddd7
3 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Client/Networking.cs
View File

@ -122,17 +122,6 @@ namespace CoopClient
Main.MainChat.Init();
// Send player connect packet
NetOutgoingMessage outgoingMessage = Client.CreateMessage();
new PlayerConnectPacket()
{
NetHandle = Main.LocalNetHandle,
SocialClubName = string.Empty,
Username = string.Empty
}.PacketToNetOutGoingMessage(outgoingMessage);
Client.SendMessage(outgoingMessage, NetDeliveryMethod.ReliableOrdered);
Client.FlushSendQueue();
#if !NON_INTERACTIVE
Main.MainMenu.ConnectedMenuSetting();
#endif

22
Server/Server.cs
View File

@ -256,6 +256,10 @@ namespace CoopServer
{
SendPlayerDisconnectPacket(message.SenderConnection.RemoteUniqueIdentifier);
}
else if (status == NetConnectionStatus.Connected)
{
SendPlayerConnectPacket(message.SenderConnection);
}
break;
case NetIncomingMessageType.Data:
// Get packet type
@ -266,18 +270,6 @@ namespace CoopServer
switch (type)
{
case (byte)PacketTypes.PlayerConnectPacket:
try
{
packet = new PlayerConnectPacket();
packet.NetIncomingMessageToPacket(message);
SendPlayerConnectPacket(message.SenderConnection, (PlayerConnectPacket)packet);
}
catch (Exception e)
{
message.SenderConnection.Disconnect(e.Message);
}
break;
case (byte)PacketTypes.FullSyncPlayerPacket:
try
{
@ -635,9 +627,9 @@ namespace CoopServer
}
// The connection has been approved, now we need to send all other players to the new player and the new player to all players
private static void SendPlayerConnectPacket(NetConnection local, PlayerConnectPacket packet)
private static void SendPlayerConnectPacket(NetConnection local)
{
Client localClient = Clients.Find(x => x.NetHandle == packet.NetHandle);
Client localClient = Clients.Find(x => x.NetHandle == local.RemoteUniqueIdentifier);
if (localClient == null)
{
local.Disconnect("No data found!");
@ -670,7 +662,7 @@ namespace CoopServer
NetOutgoingMessage outgoingMessage = MainNetServer.CreateMessage();
new PlayerConnectPacket()
{
NetHandle = packet.NetHandle,
NetHandle = local.RemoteUniqueIdentifier,
SocialClubName = localClient.Player.SocialClubName,
Username = localClient.Player.Username
}.PacketToNetOutGoingMessage(outgoingMessage);

2
Server/ServerScript.cs
View File

@ -76,7 +76,7 @@ namespace CoopServer
{
lock (_actionQueue.SyncRoot)
{
_actionQueue.Enqueue(new Action(() => _script.API.InvokePlayerConnected(client)));
_actionQueue.Enqueue(new Action(() => _script.API.InvokePlayerHandshake(client)));
}
}