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

Enable nullability in Content.Server (#3685)

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-16 15:50:20 +01:00
committed by GitHub
parent 90fec0ed24
commit a5ade526b7
306 changed files with 1616 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GlobalVerbs/AttachToGrandparentVerb.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Server.GlobalVerbs
return;
}
if (!user.TryGetComponent(out IActorComponent actor))
if (!user.TryGetComponent(out IActorComponent? actor))
{
return;
}
@@ -38,7 +38,7 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent actor))
if (!user.TryGetComponent(out IActorComponent? actor))
{
return;
}

4
Content.Server/GlobalVerbs/AttachToGridVerb.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Server.GlobalVerbs
return;
}
if (!user.TryGetComponent(out IActorComponent actor))
if (!user.TryGetComponent(out IActorComponent? actor))
{
return;
}
@@ -37,7 +37,7 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent actor))
if (!user.TryGetComponent(out IActorComponent? actor))
{
return;
}

4
Content.Server/GlobalVerbs/AttachToSelf.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Server.GlobalVerbs
return;
}
if (!user.TryGetComponent(out IActorComponent actor))
if (!user.TryGetComponent(out IActorComponent? actor))
{
return;
}
@@ -37,7 +37,7 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent actor))
if (!user.TryGetComponent(out IActorComponent? actor))
{
return;
}

8
Content.Server/GlobalVerbs/ControlMobVerb.cs
View File

@@ -52,15 +52,15 @@ namespace Content.Server.GlobalVerbs
return;
}
var userMind = player.ContentData().Mind;
var userMind = player.ContentData()?.Mind;
var targetMind = target.GetComponent<MindComponent>();
var oldEntity = userMind.CurrentEntity;
var oldEntity = userMind?.CurrentEntity;
targetMind.Mind?.TransferTo(null);
userMind.TransferTo(target);
userMind?.TransferTo(target);
if (oldEntity.HasComponent<GhostComponent>())
if (oldEntity != null && oldEntity.HasComponent<GhostComponent>())
oldEntity.Delete();
}
}

4
Content.Server/GlobalVerbs/InRangeUnoccludedVerb.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Server.GlobalVerbs
{
data.Visibility = VerbVisibility.Invisible;
if (!user.TryGetComponent(out IActorComponent actor))
if (!user.TryGetComponent(out IActorComponent? actor))
{
return;
}
@@ -36,7 +36,7 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent actor))
if (!user.TryGetComponent(out IActorComponent? actor))
{
return;
}

2
Content.Server/GlobalVerbs/PointingVerb.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent actor))
if (!user.TryGetComponent(out IActorComponent? actor))
{
return;
}

14
Content.Server/GlobalVerbs/RejuvenateVerb.cs
View File

@@ -57,37 +57,37 @@ namespace Content.Server.GlobalVerbs
public static void PerformRejuvenate(IEntity target)
{
if (target.TryGetComponent(out IDamageableComponent damage))
if (target.TryGetComponent(out IDamageableComponent? damage))
{
damage.Heal();
}
if (target.TryGetComponent(out IMobStateComponent mobState))
if (target.TryGetComponent(out IMobStateComponent? mobState))
{
mobState.UpdateState(0);
}
if (target.TryGetComponent(out HungerComponent hunger))
if (target.TryGetComponent(out HungerComponent? hunger))
{
hunger.ResetFood();
}
if (target.TryGetComponent(out ThirstComponent thirst))
if (target.TryGetComponent(out ThirstComponent? thirst))
{
thirst.ResetThirst();
}
if (target.TryGetComponent(out StunnableComponent stun))
if (target.TryGetComponent(out StunnableComponent? stun))
{
stun.ResetStuns();
}
if (target.TryGetComponent(out FlammableComponent flammable))
if (target.TryGetComponent(out FlammableComponent? flammable))
{
flammable.Extinguish();
}
if (target.TryGetComponent(out CreamPiedComponent creamPied))
if (target.TryGetComponent(out CreamPiedComponent? creamPied))
{
creamPied.Wash();
}