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

Fix clicking a locker while inside of said locker (#3965)

Browse Source 
* Fix clicking a locker while inside of said locker

Actually fixes #1535

* Address reviews

* Add test

* Clean up test
This commit is contained in:
ShadowCommander
2021-05-17 02:31:10 -07:00
committed by GitHub
parent 0ac44ade52
commit 7b00489b1f
2 changed files with 152 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -287,7 +287,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
return pull.TogglePull(player);
}
private async void UserInteraction(IEntity player, EntityCoordinates coordinates, EntityUid clickedUid)
public async void UserInteraction(IEntity player, EntityCoordinates coordinates, EntityUid clickedUid)
{
// Get entity clicked upon from UID if valid UID, if not assume no entity clicked upon and null
if (!EntityManager.TryGetEntity(clickedUid, out var attacked))
@@ -324,13 +324,6 @@ namespace Content.Server.GameObjects.EntitySystems.Click
return;
}
// If in a container
if (player.IsInContainer())
{
return;
}
// In a container where the attacked entity is not the container's owner
if (player.TryGetContainer(out var playerContainer) &&
attacked != playerContainer.Owner)
@@ -789,7 +782,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
}
}
private void DoAttack(IEntity player, EntityCoordinates coordinates, bool wideAttack, EntityUid target = default)
public void DoAttack(IEntity player, EntityCoordinates coordinates, bool wideAttack, EntityUid targetUid = default)
{
// Verify player is on the same map as the entity he clicked on
if (coordinates.GetMapId(EntityManager) != player.Transform.MapID)
@@ -807,7 +800,22 @@ namespace Content.Server.GameObjects.EntitySystems.Click
return;
}
var eventArgs = new AttackEventArgs(player, coordinates, wideAttack, target);
// In a container where the target entity is not the container's owner
if (player.TryGetContainer(out var playerContainer) &&
(!EntityManager.TryGetEntity(targetUid, out var target) ||
target != playerContainer.Owner))
{
// Either the target entity is null, not contained or in a different container
if (target == null ||
!target.TryGetContainer(out var attackedContainer) ||
attackedContainer != playerContainer)
{
return;
}
}
var eventArgs = new AttackEventArgs(player, coordinates, wideAttack, targetUid);
// Verify player has a hand, and find what object he is currently holding in his active hand
if (player.TryGetComponent<IHandsComponent>(out var hands))
@@ -826,7 +834,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
else
{
// We pick up items if our hand is empty, even if we're in combat mode.
if(EntityManager.TryGetEntity(target, out var targetEnt))
if (EntityManager.TryGetEntity(targetUid, out var targetEnt))
{
if (targetEnt.HasComponent<ItemComponent>())
{