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

2
Content.Server/Objectives/Conditions/KillPersonCondition.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.Objectives.Conditions
protected Mind? Target;
public abstract IObjectiveCondition GetAssigned(Mind mind);
public string Title => Loc.GetString("Kill {0}", Target?.OwnedEntity.Name ?? "");
public string Title => Loc.GetString("Kill {0}", Target?.OwnedEntity?.Name ?? "");
public string Description => Loc.GetString("Do it however you like, just make sure they don't last the shift.");

2
Content.Server/Objectives/Interfaces/IObjectivesManager.cs
View File

@@ -13,6 +13,6 @@ namespace Content.Server.Objectives.Interfaces
/// <summary>
/// Returns a randomly picked objective the provided mind is valid for.
/// </summary>
ObjectivePrototype GetRandomObjective(Mind mind);
ObjectivePrototype? GetRandomObjective(Mind mind);
}
}

4
Content.Server/Objectives/Objective.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Server.Objectives
}
}
public bool Equals(Objective other)
public bool Equals(Objective? other)
{
if (other is null) return false;
if (ReferenceEquals(this, other)) return true;
@@ -40,7 +40,7 @@ namespace Content.Server.Objectives
return true;
}
public override bool Equals(object obj)
public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;