Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update submodule.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-04-26 00:53:09 +02:00
parent a7ba921e42
commit 13a1be6462
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
View File

@@ -21,7 +21,7 @@ namespace Content.Server.GameObjects.Components.Instruments
/// <summary> /// <summary>
/// The client channel currently playing the instrument, or null if there's none. /// The client channel currently playing the instrument, or null if there's none.
/// </summary> /// </summary>
private INetChannel _instrumentPlayer; private ICommonSession _instrumentPlayer;
private bool _handheld; private bool _handheld;
[ViewVariables] [ViewVariables]
@@ -49,8 +49,9 @@ namespace Content.Server.GameObjects.Components.Instruments
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null) public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{ {
base.HandleNetworkMessage(message, channel, session); base.HandleNetworkMessage(message, channel, session);
// If the client that sent the message isn't the client playing this instrument, we ignore it. // If the client that sent the message isn't the client playing this instrument, we ignore it.
if (channel != _instrumentPlayer) return; if (session != _instrumentPlayer) return;
switch (message) switch (message)
{ {
case InstrumentMidiEventMessage midiEventMsg: case InstrumentMidiEventMessage midiEventMsg:
@@ -79,7 +80,7 @@ namespace Content.Server.GameObjects.Components.Instruments
if (session == null) return; if (session == null) return;
_instrumentPlayer = session.ConnectedClient; _instrumentPlayer = session;
} }
public void HandDeselected(HandDeselectedEventArgs eventArgs) public void HandDeselected(HandDeselectedEventArgs eventArgs)
@@ -96,7 +97,7 @@ namespace Content.Server.GameObjects.Components.Instruments
if (_instrumentPlayer != null) if (_instrumentPlayer != null)
return; return;
_instrumentPlayer = actor.playerSession.ConnectedClient; _instrumentPlayer = actor.playerSession;
OpenUserInterface(actor.playerSession); OpenUserInterface(actor.playerSession);
} }
@@ -105,14 +106,14 @@ namespace Content.Server.GameObjects.Components.Instruments
if (!eventArgs.User.TryGetComponent(out IActorComponent actor)) if (!eventArgs.User.TryGetComponent(out IActorComponent actor))
return false; return false;
if(_instrumentPlayer == actor.playerSession.ConnectedClient) if(_instrumentPlayer == actor.playerSession)
OpenUserInterface(actor.playerSession); OpenUserInterface(actor.playerSession);
return false; return false;
} }
private void UserInterfaceOnClosed(ServerBoundUserInterfaceMessage obj) private void UserInterfaceOnClosed(IPlayerSession player)
{ {
if (!Handheld && obj.Session.ConnectedClient == _instrumentPlayer) if (!Handheld && player == _instrumentPlayer)
{ {
_instrumentPlayer = null; _instrumentPlayer = null;
SendNetworkMessage(new InstrumentStopMidiMessage()); SendNetworkMessage(new InstrumentStopMidiMessage());

2
RobustToolbox

Submodule RobustToolbox updated: e492e3b521...7c4b1af967