player id stuff

This commit is contained in:
Aleksander Waage 2020-08-17 19:13:11 +02:00
parent 3466ff7616
commit 3edf896e6a
16 changed files with 6 additions and 21 deletions

View File

@ -24,7 +24,6 @@ namespace QSB.Animation
private ToggleMessage CreateMessage(bool value) => new ToggleMessage
{
FromId = LocalPlayerId,
AboutId = LocalPlayerId,
ToggleValue = value
};

View File

@ -22,7 +22,6 @@ namespace QSB.DeathSync
private PlayerDeathMessage CreateMessage(DeathType type) => new PlayerDeathMessage
{
FromId = LocalPlayerId,
AboutId = LocalPlayerId,
DeathType = type
};

View File

@ -22,7 +22,6 @@ namespace QSB.ElevatorSync
private ElevatorMessage CreateMessage(int id, ElevatorDirection direction) => new ElevatorMessage
{
FromId = LocalPlayerId,
Direction = direction,
ObjectId = id
};

View File

@ -22,8 +22,7 @@ namespace QSB.Events
private PlayerJoinMessage CreateMessage(string name) => new PlayerJoinMessage
{
FromId = PlayerTransformSync.LocalInstance.netId.Value,
AboutId = PlayerTransformSync.LocalInstance.netId.Value,
AboutId = LocalPlayerId,
PlayerName = name
};

View File

@ -24,7 +24,6 @@ namespace QSB.Events
private PlayerLeaveMessage CreateMessage(uint id, uint[] objects) => new PlayerLeaveMessage
{
FromId = LocalPlayerId,
AboutId = id,
ObjectIds = objects
};

View File

@ -21,7 +21,6 @@ namespace QSB.Events
private ToggleMessage CreateMessage(bool ready) => new ToggleMessage
{
FromId = LocalPlayerId,
AboutId = LocalPlayerId,
ToggleValue = ready
};

View File

@ -22,8 +22,7 @@ namespace QSB.Events
private PlayerMessage CreateMessage() => new PlayerMessage
{
FromId = PlayerTransformSync.LocalInstance.netId.Value,
AboutId = PlayerTransformSync.LocalInstance.netId.Value
AboutId = LocalPlayerId
};
public override void OnServerReceive(PlayerMessage message)

View File

@ -1,7 +1,6 @@
using QSB.Messaging;
using QSB.TransformSync;
using QSB.Utility;
using UnityEngine.Networking;
namespace QSB.Events
{
@ -12,7 +11,7 @@ namespace QSB.Events
public abstract class QSBEvent<T> where T : PlayerMessage, new()
{
public abstract MessageType Type { get; }
public uint LocalPlayerId => PlayerRegistry.LocalPlayer.NetId;
public uint LocalPlayerId => PlayerRegistry.LocalPlayerId;
private readonly MessageHandler<T> _eventHandler;
protected QSBEvent()
@ -61,6 +60,7 @@ namespace QSB.Events
public void SendEvent(T message)
{
message.FromId = PlayerRegistry.LocalPlayerId;
UnityHelper.Instance.RunWhen(() => PlayerTransformSync.LocalInstance != null, () => Send(message));
}

View File

@ -22,8 +22,7 @@ namespace QSB.GeyserSync
private GeyserMessage CreateMessage(int id, bool state) => new GeyserMessage
{
FromId = PlayerRegistry.LocalPlayer.NetId,
AboutId = PlayerRegistry.LocalPlayer.NetId,
AboutId = LocalPlayerId,
ObjectId = id,
State = state
};

View File

@ -21,8 +21,7 @@ namespace QSB.TimeSync
private ServerTimeMessage CreateMessage(float time, int count) => new ServerTimeMessage
{
FromId = PlayerRegistry.LocalPlayer.NetId,
AboutId = PlayerRegistry.LocalPlayer.NetId,
AboutId = LocalPlayerId,
ServerTime = time,
LoopCount = count
};

View File

@ -24,7 +24,6 @@ namespace QSB.Tools
private ToggleMessage CreateMessage(bool value) => new ToggleMessage
{
FromId = LocalPlayerId,
AboutId = LocalPlayerId,
ToggleValue = value
};

View File

@ -24,7 +24,6 @@ namespace QSB.Tools
private ToggleMessage CreateMessage(bool value) => new ToggleMessage
{
FromId = LocalPlayerId,
AboutId = LocalPlayerId,
ToggleValue = value
};

View File

@ -24,7 +24,6 @@ namespace QSB.Tools
private ToggleMessage CreateMessage(bool value) => new ToggleMessage
{
FromId = LocalPlayerId,
AboutId = LocalPlayerId,
ToggleValue = value
};

View File

@ -24,7 +24,6 @@ namespace QSB.Tools
private ToggleMessage CreateMessage(bool value) => new ToggleMessage
{
FromId = LocalPlayerId,
AboutId = LocalPlayerId,
ToggleValue = value
};

View File

@ -24,7 +24,6 @@ namespace QSB.Tools
private ToggleMessage CreateMessage(bool value) => new ToggleMessage
{
FromId = LocalPlayerId,
AboutId = LocalPlayerId,
ToggleValue = value
};

View File

@ -23,7 +23,6 @@ namespace QSB.TransformSync
private WorldObjectMessage CreateMessage(uint netId, QSBSector sector) => new WorldObjectMessage
{
FromId = LocalPlayerId,
AboutId = netId,
ObjectId = sector.ObjectId
};