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

Fix more errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-06 00:52:58 +01:00
parent 2b1fecbe02
commit 215cae5655
55 changed files with 262 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
View File

@@ -37,7 +37,7 @@ namespace Content.Server.Pointing.EntitySystems
}
}
private EntityUid RandomNearbyPlayer(EntityUid uid, RoguePointingArrowComponent? component = null, TransformComponent? transform = null)
private EntityUid? RandomNearbyPlayer(EntityUid uid, RoguePointingArrowComponent? component = null, TransformComponent? transform = null)
{
if (!Resolve(uid, ref component, ref transform))
return null;
@@ -68,7 +68,7 @@ namespace Content.Server.Pointing.EntitySystems
var uid = component.Owner;
component.Chasing ??= RandomNearbyPlayer(uid, component, transform);
if (component.Chasing == null)
if (component.Chasing is not {Valid: true} chasing)
{
EntityManager.QueueDeleteEntity(uid);
return;
@@ -78,7 +78,7 @@ namespace Content.Server.Pointing.EntitySystems
if (component.TurningDelay > 0)
{
var difference = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Chasing).WorldPosition - transform.WorldPosition;
var difference = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(chasing).WorldPosition - transform.WorldPosition;
var angle = difference.ToAngle();
var adjusted = angle.Degrees + 90;
var newAngle = Angle.FromDegrees(adjusted);
@@ -93,7 +93,7 @@ namespace Content.Server.Pointing.EntitySystems
UpdateAppearance(uid, component, transform);
var toChased = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Chasing).WorldPosition - transform.WorldPosition;
var toChased = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(chasing).WorldPosition - transform.WorldPosition;
transform.WorldPosition += toChased * frameTime * component.ChasingSpeed;