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

Even more resolve removals.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 17:32:32 +01:00
parent 684cb76173
commit cdc8336695
61 changed files with 364 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Paper/PaperComponent.cs
View File

@@ -19,6 +19,8 @@ namespace Content.Server.Paper
public class PaperComponent : SharedPaperComponent, IExamine, IInteractUsing, IUse
#pragma warning restore 618
{
[Dependency] private readonly IEntityManager _entMan = default!;
private PaperAction _mode;
[DataField("content")]
public string Content { get; set; } = "";
@@ -43,7 +45,7 @@ namespace Content.Server.Paper
Content = content + '\n';
UpdateUserInterface();
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
if (!_entMan.TryGetComponent(Owner, out AppearanceComponent? appearance))
return;
var status = string.IsNullOrWhiteSpace(content)
@@ -74,7 +76,7 @@ namespace Content.Server.Paper
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out ActorComponent? actor))
if (!_entMan.TryGetComponent(eventArgs.User, out ActorComponent? actor))
return false;
_mode = PaperAction.Read;
@@ -91,12 +93,12 @@ namespace Content.Server.Paper
Content += msg.Text + '\n';
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
if (_entMan.TryGetComponent(Owner, out AppearanceComponent? appearance))
{
appearance.SetData(PaperVisuals.Status, PaperStatus.Written);
}
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner).EntityDescription = "";
_entMan.GetComponent<MetaDataComponent>(Owner).EntityDescription = "";
UpdateUserInterface();
}
@@ -104,7 +106,7 @@ namespace Content.Server.Paper
{
if (!eventArgs.Using.HasTag("Write"))
return false;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out ActorComponent? actor))
if (!_entMan.TryGetComponent(eventArgs.User, out ActorComponent? actor))
return false;
_mode = PaperAction.Write;