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

CollidableComponent and ICollideableComponent namespace was changed in the engine.

Browse Source 
Minor code cleanup.
This commit is contained in:
Acruid
2020-01-11 14:12:20 -08:00
parent 51f7f14c08
commit 32103979ed
15 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ using JetBrains.Annotations;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Input;
using Robust.Shared.Interfaces.GameObjects;
@@ -322,7 +323,7 @@ namespace Content.Server.GameObjects.EntitySystems
if (userEntity.TryGetComponent(out CombatModeComponent combatMode) && combatMode.IsInCombatMode)
{
DoAttack(userEntity, coords, uid);
DoAttack(userEntity, coords);
}
else
{
@@ -747,7 +748,7 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
private void DoAttack(IEntity player, GridCoordinates coordinates, EntityUid uid)
private void DoAttack(IEntity player, GridCoordinates coordinates)
{
// Verify player is on the same map as the entity he clicked on
if (_mapManager.GetGrid(coordinates.GridID).ParentMapId != player.Transform.MapID)