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

Makes InRangeUnobstructed use MapCoordinates. Fixes #1003

Browse Source 
(Also updates Submoduke)
This commit is contained in:
Víctor Aguilera Puerto
2020-05-26 14:23:25 +02:00
parent 0108126c43
commit 8a81f54a45
10 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Server.GameObjects.Components.Construction
{
var prototype = _prototypeManager.Index<ConstructionPrototype>(prototypeName);
if (!InteractionChecks.InRangeUnobstructed(Owner, loc.ToMapPos(_mapManager),
if (!InteractionChecks.InRangeUnobstructed(Owner, loc.ToMap(_mapManager),
ignoredEnt: Owner, insideBlockerValid: prototype.CanBuildInImpassable))
{
return;

2
Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Server.GameObjects.Components.Interactable
var coordinates = mapGrid.GridTileToLocal(tile.GridIndices);
if (!_entitySystemManager.GetEntitySystem<InteractionSystem>().InRangeUnobstructed(user.Transform.MapPosition, coordinates.ToMapPos(_mapManager), ignoredEnt:user))
if (!_entitySystemManager.GetEntitySystem<InteractionSystem>().InRangeUnobstructed(user.Transform.MapPosition, coordinates.ToMap(_mapManager), ignoredEnt:user))
return;
var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId];

2
Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
View File

@@ -97,7 +97,7 @@ namespace Content.Server.GameObjects
return false;
var userPos = user.Transform.MapPosition;
var itemPos = Owner.Transform.WorldPosition;
var itemPos = Owner.Transform.MapPosition;
return InteractionChecks.InRangeUnobstructed(user, itemPos, ignoredEnt: Owner, insideBlockerValid:true);
}

2
Content.Server/GameObjects/Components/WiresComponent.cs
View File

@@ -239,7 +239,7 @@ namespace Content.Server.GameObjects.Components
return;
}
if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(player.Transform.MapPosition, Owner.Transform.WorldPosition, ignoredEnt: Owner))
if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(player.Transform.MapPosition, Owner.Transform.MapPosition, ignoredEnt: Owner))
{
_notifyManager.PopupMessage(Owner.Transform.GridPosition, player, _localizationManager.GetString("You can't reach there!"));
return;