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

Replace every usage of GridCoordinates with EntityCoordinates (#2021)

Browse Source 
* Update RobustToolbox

* Transition direct type usages

* More updates

* Fix invalid use of to map

* Update RobustToolbox

* Fix dropping items

* Rename name usages of "GridCoordinates" to "EntityCoordinates"

* Revert "Update RobustToolbox"

This reverts commit 9f334a17c5908ded0043a63158bb671e4aa3f346.

* Revert "Update RobustToolbox"

This reverts commit 3a9c8cfa3606fa501aa84407796d2ad920853a09.

# Conflicts:
#	RobustToolbox

* Fix cursed IMapGrid method usage.

* GridTileLookupTest now uses EntityCoordinates

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: Víctor Aguilera Puerto <zddm@outlook.es>
This commit is contained in:
DrSmugleaf
2020-09-06 16:11:53 +02:00
committed by GitHub
parent 72d2318ea7
commit 48b61f6bcc
196 changed files with 780 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Server/Administration/WarpCommand.cs
View File

@@ -60,32 +60,36 @@ namespace Content.Server.Administration
var mapManager = IoCManager.Resolve<IMapManager>();
var currentMap = player.AttachedEntity.Transform.MapID;
var currentGrid = player.AttachedEntity.Transform.GridID;
var entityManager = IoCManager.Resolve<IEntityManager>();
var found = comp.EntityQuery<WarpPointComponent>()
.Where(p => p.Location == location)
.Select(p => p.Owner.Transform.GridPosition)
.OrderBy(p => p, Comparer<GridCoordinates>.Create((a, b) =>
.Select(p => p.Owner.Transform.Coordinates)
.OrderBy(p => p, Comparer<EntityCoordinates>.Create((a, b) =>
{
// Sort so that warp points on the same grid/map are first.
// So if you have two maps loaded with the same warp points,
// it will prefer the warp points on the map you're currently on.
if (a.GridID == b.GridID)
var aGrid = a.GetGridId(entityManager);
var bGrid = b.GetGridId(entityManager);
if (aGrid == bGrid)
{
return 0;
}
if (a.GridID == currentGrid)
if (aGrid == currentGrid)
{
return -1;
}
if (b.GridID == currentGrid)
if (bGrid == currentGrid)
{
return 1;
}
var mapA = mapManager.GetGrid(a.GridID).ParentMapId;
var mapB = mapManager.GetGrid(b.GridID).ParentMapId;
var mapA = mapManager.GetGrid(aGrid).ParentMapId;
var mapB = mapManager.GetGrid(bGrid).ParentMapId;
if (mapA == mapB)
{
@@ -106,9 +110,9 @@ namespace Content.Server.Administration
}))
.FirstOrDefault();
if (found.GridID != GridId.Invalid)
if (found.GetGridId(entityManager) != GridId.Invalid)
{
player.AttachedEntity.Transform.GridPosition = found;
player.AttachedEntity.Transform.Coordinates = found;
if (player.AttachedEntity.TryGetComponent(out ICollidableComponent collidable))
{
collidable.Stop();