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

Refactor InRangeUnobstructed and add extension methods (#1925)

Browse Source 
* Sort out InRangeUnobstructed and add extension methods

* Rename client RangeChecks to RangeExtensions

* Add container extension methods and test

* Add missing component methods

Component to container
Grid coordinates to container
Map coordinates to container
Local player to container

* Actually use the field

* Merge fixes

* Add popup argument to local player extension methods

* Reduce code repetition for client range extensions
This commit is contained in:
DrSmugleaf
2020-08-30 11:37:06 +02:00
committed by GitHub
parent 9ec3ddf368
commit 9d6c394f6b
39 changed files with 1287 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs
View File

@@ -1,5 +1,4 @@

using Robust.Server.GameObjects;
using Robust.Server.GameObjects;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Interfaces;
using Robust.Shared.GameObjects;
@@ -22,6 +21,8 @@ using Content.Shared.GameObjects.Components.Mobs;
using Robust.Shared.Maths;
using System;
using System.Collections.Generic;
using Content.Shared.Utility;
using Serilog;
using Content.Server.GameObjects.Components.GUI;
namespace Content.Server.GameObjects.Components.ActionBlocking
@@ -109,11 +110,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
return;
}
if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(
handcuff.Transform.MapPosition,
Owner.Transform.MapPosition,
_interactRange,
ignoredEnt: Owner))
if (!handcuff.InRangeUnobstructed(Owner, _interactRange))
{
Logger.Warning("Handcuffs being applied to player are obstructed or too far away! This should not happen!");
return;
@@ -131,7 +128,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
/// <summary>
/// Check the current amount of hands the owner has, and if there's less hands than active cuffs we remove some cuffs.
/// </summary>
private void UpdateHandCount()
private void UpdateHandCount()
{
var dirty = false;
var handCount = _hands.Hands.Count();
@@ -238,22 +235,13 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
return;
}
if (!isOwner &&
!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(
user.Transform.MapPosition,
Owner.Transform.MapPosition,
_interactRange,
ignoredEnt: Owner))
if (!isOwner && user.InRangeUnobstructed(Owner, _interactRange))
{
user.PopupMessage(user, Loc.GetString("You are too far away to remove the cuffs."));
return;
}
if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(
cuffsToRemove.Transform.MapPosition,
Owner.Transform.MapPosition,
_interactRange,
ignoredEnt: Owner))
if (!cuffsToRemove.InRangeUnobstructed(Owner, _interactRange))
{
Logger.Warning("Handcuffs being removed from player are obstructed or too far away! This should not happen!");
return;

11
Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
View File

@@ -16,6 +16,7 @@ using Content.Shared.GameObjects.Components.ActionBlocking;
using Content.Server.GameObjects.Components.Mobs;
using Robust.Shared.Maths;
using System;
using Content.Shared.Utility;
namespace Content.Server.GameObjects.Components.ActionBlocking
{
@@ -115,7 +116,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
private float _interactRange;
private DoAfterSystem _doAfterSystem;
private AudioSystem _audioSystem;
public override void Initialize()
{
base.Initialize();
@@ -182,11 +183,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
return;
}
if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(
eventArgs.User.Transform.MapPosition,
eventArgs.Target.Transform.MapPosition,
_interactRange,
ignoredEnt: Owner))
if (!eventArgs.InRangeUnobstructed(_interactRange, ignoreInsideBlocker: true))
{
_notifyManager.PopupMessage(eventArgs.User, eventArgs.User, Loc.GetString("You are too far away to use the cuffs!"));
return;
@@ -196,7 +193,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
_notifyManager.PopupMessage(eventArgs.User, eventArgs.Target, Loc.GetString("{0:theName} starts cuffing you!", eventArgs.User));
_audioSystem.PlayFromEntity(StartCuffSound, Owner);
TryUpdateCuff(eventArgs.User, eventArgs.Target, cuffed);
TryUpdateCuff(eventArgs.User, eventArgs.Target, cuffed);
}
/// <summary>