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

Replace IEntityManager resolves in systems for cached EntityManager

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 13:00:43 +01:00
parent 2699540526
commit c8b65be747
98 changed files with 338 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Lock/LockSystem.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Server.Lock
private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner, out AppearanceComponent? appearance))
if (EntityManager.TryGetComponent(lockComp.Owner, out AppearanceComponent? appearance))
{
appearance.SetData(StorageVisuals.CanLock, true);
}
@@ -64,7 +64,7 @@ namespace Content.Server.Lock
args.PushText(Loc.GetString(lockComp.Locked
? "lock-comp-on-examined-is-locked"
: "lock-comp-on-examined-is-unlocked",
("entityName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
("entityName", Name: EntityManager.GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
}
public bool TryLock(EntityUid uid, EntityUid user, LockComponent? lockComp = null)
@@ -78,7 +78,7 @@ namespace Content.Server.Lock
if (!HasUserAccess(uid, user, quiet: false))
return false;
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-lock-success", ("entityName",Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-lock-success", ("entityName",Name: EntityManager.GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
lockComp.Locked = true;
if(lockComp.LockSound != null)
@@ -86,7 +86,7 @@ namespace Content.Server.Lock
SoundSystem.Play(Filter.Pvs(lockComp.Owner), lockComp.LockSound.GetSound(), lockComp.Owner, AudioParams.Default.WithVolume(-5));
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
if (EntityManager.TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
{
appearanceComp.SetData(StorageVisuals.Locked, true);
}
@@ -107,7 +107,7 @@ namespace Content.Server.Lock
if (!HasUserAccess(uid, user, quiet: false))
return false;
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-unlock-success", ("entityName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-unlock-success", ("entityName", Name: EntityManager.GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
lockComp.Locked = false;
if(lockComp.UnlockSound != null)
@@ -115,7 +115,7 @@ namespace Content.Server.Lock
SoundSystem.Play(Filter.Pvs(lockComp.Owner), lockComp.UnlockSound.GetSound(), lockComp.Owner, AudioParams.Default.WithVolume(-5));
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
if (EntityManager.TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
{
appearanceComp.SetData(StorageVisuals.Locked, false);
}