mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-25 15:35:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into tornadoes

Browse Source
This commit is contained in:
JohnCorby 2021-12-06 01:53:32 -08:00
commit b4dde8dc22
5 changed files with 104 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
QSB/Events/QSBEvent.cs
View File

@ -34,19 +34,26 @@ namespace QSB.Events
public abstract bool RequireWorldObjectsReady { get; }
public void SendEvent(T message)
{
message.FromId = QSBPlayerManager.LocalPlayerId;
QSBCore.UnityEvents.RunWhen(
() => PlayerTransformSync.LocalInstance != null,
() => _eventHandler.SendToServer(message));
}
/// used to force set ForId for every sent event
protected static uint ForIdOverride = uint.MaxValue;
public void SendEvent(T message) => QSBCore.UnityEvents.RunWhen(
() => PlayerTransformSync.LocalInstance != null,
() =>
{
message.FromId = LocalPlayerId;
if (ForIdOverride != uint.MaxValue)
{
message.ForId = ForIdOverride;
}
_eventHandler.SendToServer(message);
});
/// <summary>
/// Checks whether the message should be processed by the executing client/server.
/// Checks whether the message should be processed by the executing client.
/// </summary>
/// <returns>True if the message should be processed.</returns>
public virtual bool CheckMessage(bool isServer, T message)
public virtual bool CheckMessage(T message)
=> !RequireWorldObjectsReady || WorldObjectManager.AllObjectsReady;
private void OnReceive(bool isServer, T message)
@ -59,18 +66,24 @@ namespace QSB.Events
* hub for all events.
*/
if (!CheckMessage(isServer, message))
{
return;
}
if (isServer)
{
_eventHandler.SendToAll(message);
if (message.OnlySendToHost)
{
_eventHandler.SendToHost(message);
}
else if (message.ForId != uint.MaxValue)
{
_eventHandler.SendTo(message.ForId, message);
}
else
{
_eventHandler.SendToAll(message);
}
return;
}
if (message.OnlySendToHost && !QSBCore.IsHost)
if (!CheckMessage(message))
{
return;
}
@ -87,8 +100,8 @@ namespace QSB.Events
if (!player.IsReady
&& player.PlayerId != LocalPlayerId
&& (player.State is ClientState.AliveInSolarSystem or ClientState.AliveInEye or ClientState.DeadInSolarSystem)
&& (message is not PlayerInformationEvent or PlayerReadyEvent))
&& player.State is ClientState.AliveInSolarSystem or ClientState.AliveInEye or ClientState.DeadInSolarSystem
&& this is not PlayerInformationEvent or PlayerReadyEvent)
{
DebugLog.ToConsole($"Warning - Got message from player {message.FromId}, but they were not ready. Asking for state resync, just in case.", MessageType.Warning);
QSBEventManager.FireEvent(EventNames.QSBRequestStateResync);
@ -97,14 +110,14 @@ namespace QSB.Events
try
{
if (message.FromId == QSBPlayerManager.LocalPlayerId ||
QSBPlayerManager.IsBelongingToLocalPlayer(message.FromId))
if (QSBPlayerManager.IsBelongingToLocalPlayer(message.FromId))
{
OnReceiveLocal(QSBCore.IsHost, message);
return;
}
OnReceiveRemote(QSBCore.IsHost, message);
else
{
OnReceiveRemote(QSBCore.IsHost, message);
}
}
catch (Exception ex)
{

29
QSB/Messaging/MessageHandler.cs
View File

@ -1,5 +1,4 @@
using QSB.Events;
using QSB.Utility;
using QSB.Utility;
using QuantumUNET;
using QuantumUNET.Components;
using QuantumUNET.Messages;
@ -58,6 +57,32 @@ namespace QSB.Messaging
QNetworkServer.SendToAll(_eventType, message);
}
public void SendToHost(T message)
{
if (!QSBNetworkManager.Instance.IsReady)
{
return;
}
QNetworkServer.SendToClient(0, _eventType, message);
}
public void SendTo(uint id, T message)
{
if (!QSBNetworkManager.Instance.IsReady)
{
return;
}
var conn = QNetworkServer.connections.FirstOrDefault(x => x.GetPlayerId() == id);
if (conn == null)
{
DebugLog.ToConsole($"SendTo unknown player! id: {id}, message: {message.GetType().Name}", OWML.Common.MessageType.Error);
return;
}
QNetworkServer.SendToClient(conn.connectionId, _eventType, message);
}
public void SendToServer(T message)
{
if (!QSBNetworkManager.Instance.IsReady)

19
QSB/Messaging/PlayerMessage.cs
View File

@ -16,16 +16,27 @@ namespace QSB.Messaging
public uint AboutId { get; set; }
/// <summary>
/// If true, only send this message to the host of the current session
/// If true, only send this message to the host of the current session
/// (OnReceiveLocal/Remote is not called on any other client)
/// </summary>
public bool OnlySendToHost { get; set; }
/// <summary>
/// The Player ID that this message is for.
/// By default, this is uint.MaxValue,
/// which means this is ignored and the message is sent to all clients
/// </summary>
public uint ForId { get; set; } = uint.MaxValue;
public override void Deserialize(QNetworkReader reader)
{
FromId = reader.ReadUInt32();
AboutId = reader.ReadUInt32();
OnlySendToHost = reader.ReadBoolean();
if (!OnlySendToHost)
{
reader.ReadUInt32();
}
}
public override void Serialize(QNetworkWriter writer)
@ -33,6 +44,10 @@ namespace QSB.Messaging
writer.Write(FromId);
writer.Write(AboutId);
writer.Write(OnlySendToHost);
if (!OnlySendToHost)
{
writer.Write(ForId);
}
}
}
}
}

33
QSB/Player/Events/RequestStateResyncEvent.cs
View File

@ -31,20 +31,31 @@ namespace QSB.Player.Events
public override void OnReceiveRemote(bool isHost, PlayerMessage message)
{
// if host, send worldobject and server states
if (isHost)
// send response only to the requesting client
ForIdOverride = message.FromId;
try
{
QSBEventManager.FireEvent(EventNames.QSBServerState, ServerStateManager.Instance.GetServerState());
QSBEventManager.FireEvent(EventNames.QSBPlayerInformation);
// if host, send worldobject and server states
if (isHost)
{
QSBEventManager.FireEvent(EventNames.QSBServerState, ServerStateManager.Instance.GetServerState());
QSBEventManager.FireEvent(EventNames.QSBPlayerInformation);
SendWorldObjectInfo();
return;
if (WorldObjectManager.AllObjectsReady)
{
SendWorldObjectInfo();
}
}
// if client, send player and client states
else
{
QSBEventManager.FireEvent(EventNames.QSBPlayerInformation);
}
}
finally
{
ForIdOverride = uint.MaxValue;
}
// if client, send player and client states
QSBEventManager.FireEvent(EventNames.QSBPlayerInformation);
}
private void SendWorldObjectInfo()

4
QSB/QuantumSync/Events/QuantumAuthorityEvent.cs
View File

@ -20,9 +20,9 @@ namespace QSB.QuantumSync.Events
AuthorityOwner = authorityOwner
};
public override bool CheckMessage(bool isServer, QuantumAuthorityMessage message)
public override bool CheckMessage(QuantumAuthorityMessage message)
{
if (!base.CheckMessage(isServer, message))
if (!base.CheckMessage(message))
{
return false;
}