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

Dumb orbit fix (#6806)

Browse Source
This commit is contained in:
mirrorcult
2022-02-19 17:42:11 -07:00
committed by GitHub
parent 3e6bf54727
commit 35f0b9bbcd
2 changed files with 33 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Shared/Follower/FollowerSystem.cs
View File

@@ -71,18 +71,13 @@ public sealed class FollowerSystem : EntitySystem
followerComp.Following = entity;
var followedComp = EnsureComp<FollowedComponent>(entity);
if (!followedComp.Following.Add(follower))
return;
followedComp.Following.Add(follower);
var xform = Transform(follower);
xform.AttachParent(entity);
xform.LocalPosition = Vector2.Zero;
if (TryComp<AppearanceComponent>(follower, out var appearance))
{
EnsureComp<OrbitVisualsComponent>(follower);
appearance.SetData(OrbitingVisuals.IsOrbiting, true);
}
EnsureComp<OrbitVisualsComponent>(follower);
var followerEv = new StartedFollowingEntityEvent(entity, follower);
var entityEv = new EntityStartedFollowingEvent(entity, follower);
@@ -110,12 +105,7 @@ public sealed class FollowerSystem : EntitySystem
Transform(uid).AttachToGridOrMap();
if (TryComp<AppearanceComponent>(uid, out var appearance))
{
// We don't remove OrbitVisuals here since the OrbitVisualsSystem will handle that itself
// during the OnChangeData, which is deferred..
appearance.SetData(OrbitingVisuals.IsOrbiting, false);
}
RemComp<OrbitVisualsComponent>(uid);
var uidEv = new StoppedFollowingEntityEvent(target, uid);
var targetEv = new EntityStoppedFollowingEvent(target, uid);
@@ -191,10 +181,3 @@ public sealed class EntityStoppedFollowingEvent : FollowEvent
{
}
}
[Serializable, NetSerializable]
public enum OrbitingVisuals : byte
{
IsOrbiting
}