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

Content mapmanager query changes (#16894)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-28 23:22:44 +10:00
committed by GitHub
parent 16bf85f6e0
commit cd487b66e4
29 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Construction/SharedConstructionSystem.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Shared.Construction
if (!canBuildInImpassable)
return null;
if (!_mapManager.TryFindGridAt(coords, out var grid))
if (!_mapManager.TryFindGridAt(coords, out _, out var grid))
return null;
var ignored = grid.GetAnchoredEntities(coords).ToHashSet();

2
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -689,7 +689,7 @@ namespace Content.Shared.Interaction
ignoreAnchored = angleDelta < wallMount.Arc / 2 || Math.Tau - angleDelta < wallMount.Arc / 2;
}
if (ignoreAnchored && _mapManager.TryFindGridAt(targetCoords, out var grid))
if (ignoreAnchored && _mapManager.TryFindGridAt(targetCoords, out _, out var grid))
ignored.UnionWith(grid.GetAnchoredEntities(targetCoords));
}

2
Content.Shared/Maps/TurfHelpers.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Shared.Maps
mapManager ??= IoCManager.Resolve<IMapManager>();
var pos = coordinates.ToMap(entityManager, entityManager.System<SharedTransformSystem>());
if (!mapManager.TryFindGridAt(pos, out var grid))
if (!mapManager.TryFindGridAt(pos, out _, out var grid))
return null;
if (!grid.TryGetTileRef(coordinates, out var tile))

2
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -137,7 +137,7 @@ namespace Content.Shared.Throwing
if (thrownItem.Thrower is not null)
_adminLogger.Add(LogType.Landed, LogImpact.Low, $"{ToPrettyString(landing):entity} thrown by {ToPrettyString(thrownItem.Thrower.Value):thrower} landed.");
_broadphase.RegenerateContacts(physics);
_broadphase.RegenerateContacts(uid, physics);
var landEvent = new LandEvent(thrownItem.Thrower, playSound);
RaiseLocalEvent(landing, ref landEvent);
}