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

Fix two interaction prediction issues (#7356)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-31 20:08:30 +13:00
committed by GitHub
parent dab0020d35
commit 4ad36f10e7
7 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Interaction/IInteractUsing.cs
View File

@@ -71,13 +71,7 @@ namespace Content.Shared.Interaction
/// </summary>
public EntityCoordinates ClickLocation { get; }
/// <summary>
/// If true, this prediction is also being predicted client-side. So care has to be taken to avoid audio
/// duplication.
/// </summary>
public bool Predicted { get; }
public InteractUsingEvent(EntityUid user, EntityUid used, EntityUid target, EntityCoordinates clickLocation, bool predicted = false)
public InteractUsingEvent(EntityUid user, EntityUid used, EntityUid target, EntityCoordinates clickLocation)
{
// Interact using should not have the same used and target.
// That should be a use-in-hand event instead.
@@ -88,7 +82,6 @@ namespace Content.Shared.Interaction
Used = used;
Target = target;
ClickLocation = clickLocation;
Predicted = predicted;
}
}
}

3
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -627,7 +627,6 @@ namespace Content.Shared.Interaction
EntityUid used,
EntityUid target,
EntityCoordinates clickLocation,
bool predicted = false,
bool checkCanInteract = true,
bool checkCanUse = true)
{
@@ -641,7 +640,7 @@ namespace Content.Shared.Interaction
return;
// all interactions should only happen when in range / unobstructed, so no range check is needed
var interactUsingEvent = new InteractUsingEvent(user, used, target, clickLocation, predicted);
var interactUsingEvent = new InteractUsingEvent(user, used, target, clickLocation);
RaiseLocalEvent(target, interactUsingEvent);
if (interactUsingEvent.Handled)
return;