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

Revert "Fix chat bubbles (#25643)" (#25645)

Browse Source 
* Revert "Fix chat bubbles (#25643)"

This reverts commit 23d2c4d924.

* Revert "Fixes obsolete Transform warnings in Content. (#25256)"

This reverts commit f284b43ff6.
This commit is contained in:
metalgearsloth
2024-02-28 00:51:20 +11:00
committed by GitHub
parent d204896bf5
commit a9502be29e
154 changed files with 435 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
View File

@@ -36,7 +36,7 @@ public sealed partial class PathfindingSystem
return Vector2.Zero;
}
endPos = _transform.GetInvWorldMatrix(startXform).Transform(_transform.GetWorldMatrix(endXform).Transform(endPos));
endPos = startXform.InvWorldMatrix.Transform(endXform.WorldMatrix.Transform(endPos));
}
// TODO: Numerics when we changeover.

2
Content.Server/NPC/Pathfinding/PathfindingSystem.cs
View File

@@ -405,7 +405,7 @@ namespace Content.Server.NPC.Pathfinding
return null;
}
var localPos = _transform.GetInvWorldMatrix(xform).Transform(coordinates.ToMapPos(EntityManager));
var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager));
var origin = GetOrigin(localPos);
if (!TryGetChunk(origin, comp, out var chunk))

2
Content.Server/NPC/Systems/NPCSteeringSystem.cs
View File

@@ -462,7 +462,7 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
}
var targetPos = steering.Coordinates.ToMap(EntityManager, _transform);
var ourPos = _transform.GetMapCoordinates((uid, xform));
var ourPos = xform.MapPosition;
PrunePath(uid, ourPos, targetPos.Position - ourPos.Position, result.Path);
steering.CurrentPath = new Queue<PathPoly>(result.Path);

2
Content.Server/NPC/Systems/NPCUtilitySystem.cs
View File

@@ -369,7 +369,7 @@ public sealed class NPCUtilitySystem : EntitySystem
if (compQuery.Components.Count == 0)
return;
var mapPos = _transform.GetMapCoordinates(owner);
var mapPos = _xformQuery.GetComponent(owner).MapPosition;
_compTypes.Clear();
var i = -1;
EntityPrototype.ComponentRegistryEntry compZero = default!;

3
Content.Server/NPC/Systems/NpcFactionSystem.cs
View File

@@ -12,7 +12,6 @@ namespace Content.Server.NPC.Systems;
public sealed partial class NpcFactionSystem : EntitySystem
{
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly SharedTransformSystem _xformSystem = default!;
[Dependency] private readonly IPrototypeManager _protoManager = default!;
private ISawmill _sawmill = default!;
@@ -154,7 +153,7 @@ public sealed partial class NpcFactionSystem : EntitySystem
if (!xformQuery.TryGetComponent(entity, out var entityXform))
yield break;
foreach (var ent in _lookup.GetEntitiesInRange<NpcFactionMemberComponent>(_xformSystem.GetMapCoordinates((entity, entityXform)), range))
foreach (var ent in _lookup.GetEntitiesInRange<NpcFactionMemberComponent>(entityXform.MapPosition, range))
{
if (ent.Owner == entity)
continue;