tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix structure instruments' failing InRangeUnobstructed check

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-10-29 12:22:56 +01:00
parent 1ec3e53f8c
commit 90742247e1
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Content.Client/Instruments/InstrumentMenu.cs
View File

@@ -1,6 +1,7 @@
using Content.Client.GameObjects.Components.Instruments; using Content.Client.GameObjects.Components.Instruments;
using Content.Client.UserInterface.Stylesheets; using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.GameObjects.EntitySystems;
using Robust.Client.Audio.Midi; using Robust.Client.Audio.Midi;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
@@ -176,34 +177,20 @@ namespace Content.Client.Instruments
var filters = new FileDialogFilters(new FileDialogFilters.Group("mid", "midi")); var filters = new FileDialogFilters(new FileDialogFilters.Group("mid", "midi"));
var filename = await _fileDialogManager.OpenFile(filters); var filename = await _fileDialogManager.OpenFile(filters);
var instrumentEnt = _owner.Instrument.Owner;
var instrument = _owner.Instrument;
ContainerHelpers.TryGetContainerMan(_owner.Instrument.Owner, out var conMan);
var localPlayer = IoCManager.Resolve<IPlayerManager>().LocalPlayer;
// The following checks are only in place to prevent players from playing MIDI songs locally. // The following checks are only in place to prevent players from playing MIDI songs locally.
// There are equivalents for these checks on the server. // There are equivalents for these checks on the server.
if (string.IsNullOrEmpty(filename)) return; if (string.IsNullOrEmpty(filename)) return;
// If we don't have a player or controlled entity, we return.
if(localPlayer?.ControlledEntity == null) return;
// If the instrument is handheld and we're not holding it, we return.
if((instrument.Handheld && (conMan == null
|| conMan.Owner != localPlayer.ControlledEntity))) return;
// We check that we're in range unobstructed just in case.
if (!localPlayer.InRangeUnobstructed(instrumentEnt)) return;
if (!_midiManager.IsMidiFile(filename)) if (!_midiManager.IsMidiFile(filename))
{ {
Logger.Warning($"Not a midi file! Chosen file: {filename}"); Logger.Warning($"Not a midi file! Chosen file: {filename}");
return; return;
} }
if (!PlayCheck())
return;
MidiStopButtonOnPressed(null); MidiStopButtonOnPressed(null);
await Timer.Delay(100); await Timer.Delay(100);
if (!_owner.Instrument.OpenMidi(filename)) return; if (!_owner.Instrument.OpenMidi(filename)) return;
@@ -216,6 +203,9 @@ namespace Content.Client.Instruments
{ {
if (obj.Pressed) if (obj.Pressed)
{ {
if (!PlayCheck())
return;
MidiStopButtonOnPressed(null); MidiStopButtonOnPressed(null);
_owner.Instrument.OpenInput(); _owner.Instrument.OpenInput();
} }
@@ -223,6 +213,26 @@ namespace Content.Client.Instruments
_owner.Instrument.CloseInput(); _owner.Instrument.CloseInput();
} }
private bool PlayCheck()
{
var instrumentEnt = _owner.Instrument.Owner;
var instrument = _owner.Instrument;
ContainerHelpers.TryGetContainerMan(_owner.Instrument.Owner, out var conMan);
var localPlayer = IoCManager.Resolve<IPlayerManager>().LocalPlayer;
// If we don't have a player or controlled entity, we return.
if(localPlayer?.ControlledEntity == null) return false;
// If the instrument is handheld and we're not holding it, we return.
if((instrument.Handheld && (conMan == null
|| conMan.Owner != localPlayer.ControlledEntity))) return false;
// We check that we're in range unobstructed just in case.
return localPlayer.InRangeUnobstructed(instrumentEnt, predicate:(e) => e == instrumentEnt || e == localPlayer.ControlledEntity);
}
private void MidiStopButtonOnPressed(BaseButton.ButtonEventArgs obj) private void MidiStopButtonOnPressed(BaseButton.ButtonEventArgs obj)
{ {
MidiPlaybackSetButtonsDisabled(true); MidiPlaybackSetButtonsDisabled(true);