mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-03-13 07:14:19 +00:00
Code Issues Projects Releases Wiki Activity

more error checking

Browse Source
This commit is contained in:
JohnCorby 2021-12-11 19:02:34 -08:00
parent c7d694757c
commit a2ce35e178
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QSB/Events/QSBEvent.cs
View File

@ -2,7 +2,6 @@ using JetBrains.Annotations;
using OWML.Utils;
using QSB.Messaging;
using QSB.Player;
using QSB.Player.TransformSync;
using QSB.WorldSync;
using QuantumUNET.Transport;
using System;
@ -94,5 +93,7 @@ namespace QSB.Events
public override bool ShouldReceive => Event.Invoke<bool>("CheckMessage", Message);
public override void OnReceiveRemote() => Event.Invoke("OnReceiveRemote", QSBCore.IsHost, Message);
public override void OnReceiveLocal() => Event.Invoke("OnReceiveLocal", QSBCore.IsHost, Message);
public override string ToString() => Event.GetType().Name;
}
}

1
QSB/Events/QSBEventManager.cs
View File

@ -43,6 +43,7 @@ namespace QSB.Events
{
if (!QSBCore.IsInMultiplayer)
{
DebugLog.ToConsole($"Warning - Tried to send event {eventName} while not connected to/hosting server.", MessageType.Warning);
return;
}

2
QSB/Messaging/QSBMessage.cs
View File

@ -32,6 +32,8 @@ namespace QSB.Messaging
public virtual bool ShouldReceive => true;
public virtual void OnReceiveRemote() { }
public virtual void OnReceiveLocal() { }
public override string ToString() => GetType().Name;
}

14
QSB/Messaging/QSBMessageManager.cs
View File

@ -69,7 +69,7 @@ namespace QSB.Messaging
var conn = QNetworkServer.connections.FirstOrDefault(x => msg.To == x.GetPlayerId());
if (conn == null)
{
DebugLog.ToConsole($"SendTo unknown player! id: {msg.To}, message: {msg.GetType().Name}", MessageType.Error);
DebugLog.ToConsole($"SendTo unknown player! id: {msg.To}, message: {msg}", MessageType.Error);
return;
}
conn.Send(msgType, msg);
@ -84,7 +84,7 @@ namespace QSB.Messaging
if (PlayerTransformSync.LocalInstance == null)
{
DebugLog.ToConsole($"Warning - Tried to handle message of type <{msg.GetType().Name}> before localplayer was established.", MessageType.Warning);
DebugLog.ToConsole($"Warning - Tried to handle message {msg} before localplayer was established.", MessageType.Warning);
return;
}
@ -97,7 +97,7 @@ namespace QSB.Messaging
&& player.State is ClientState.AliveInSolarSystem or ClientState.AliveInEye or ClientState.DeadInSolarSystem
&& msg is not QSBEventRelay { Event: PlayerInformationEvent or PlayerReadyEvent or RequestStateResyncEvent or ServerStateEvent })
{
DebugLog.ToConsole($"Warning - Got message (type:{msg.GetType().Name}) from player {msg.From}, but they were not ready. Asking for state resync, just in case.", MessageType.Warning);
DebugLog.ToConsole($"Warning - Got message {msg} from player {msg.From}, but they were not ready. Asking for state resync, just in case.", MessageType.Warning);
QSBEventManager.FireEvent(EventNames.QSBRequestStateResync);
}
}
@ -120,7 +120,7 @@ namespace QSB.Messaging
}
catch (Exception ex)
{
DebugLog.ToConsole($"Error - Exception handling message {msg.GetType().Name} : {ex}", MessageType.Error);
DebugLog.ToConsole($"Error - Exception handling message {msg} : {ex}", MessageType.Error);
}
}
@ -130,6 +130,12 @@ namespace QSB.Messaging
public static void Send<M>(this M message)
where M : QSBMessage, new()
{
if (!QSBCore.IsInMultiplayer)
{
DebugLog.ToConsole($"Warning - Tried to send message {message} while not connected to/hosting server.", MessageType.Warning);
return;
}
var msgType = _typeToMsgType[typeof(M)];
message.From = QSBPlayerManager.LocalPlayerId;
QNetworkManager.singleton.client.Send(msgType, message);