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

42
Content.Server/Mobs/Mind.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Observer;
@@ -11,6 +12,7 @@ using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Network;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
namespace Content.Server.Mobs
@@ -51,26 +53,26 @@ namespace Content.Server.Mobs
public bool IsVisitingEntity => VisitingEntity != null;
[ViewVariables]
public IEntity VisitingEntity { get; private set; }
public IEntity? VisitingEntity { get; private set; }
[ViewVariables] public IEntity CurrentEntity => VisitingEntity ?? OwnedEntity;
[ViewVariables] public IEntity? CurrentEntity => VisitingEntity ?? OwnedEntity;
[ViewVariables(VVAccess.ReadWrite)]
public string CharacterName { get; set; }
public string? CharacterName { get; set; }
/// <summary>
/// The component currently owned by this mind.
/// Can be null.
/// </summary>
[ViewVariables]
public MindComponent OwnedComponent { get; private set; }
public MindComponent? OwnedComponent { get; private set; }
/// <summary>
/// The entity currently owned by this mind.
/// Can be null.
/// </summary>
[ViewVariables]
public IEntity OwnedEntity => OwnedComponent?.Owner;
public IEntity? OwnedEntity => OwnedComponent?.Owner;
/// <summary>
/// An enumerable over all the roles this mind has.
@@ -89,7 +91,7 @@ namespace Content.Server.Mobs
/// Can be null, in which case the player is currently not logged in.
/// </summary>
[ViewVariables]
public IPlayerSession Session
public IPlayerSession? Session
{
get
{
@@ -193,10 +195,11 @@ namespace Content.Server.Mobs
/// <exception cref="ArgumentException">
/// Thrown if <paramref name="entity"/> is already owned by another mind.
/// </exception>
public void TransferTo(IEntity entity)
public void TransferTo(IEntity? entity)
{
MindComponent component = null;
bool alreadyAttached = false;
MindComponent? component = null;
var alreadyAttached = false;
if (entity != null)
{
if (!entity.TryGetComponent(out component))
@@ -209,7 +212,7 @@ namespace Content.Server.Mobs
throw new ArgumentException("That entity already has a mind.", nameof(entity));
}
if (entity.TryGetComponent(out IActorComponent actor))
if (entity.TryGetComponent(out IActorComponent? actor))
{
// Happens when transferring to your currently visited entity.
if (actor.playerSession != Session)
@@ -244,7 +247,8 @@ namespace Content.Server.Mobs
public void ChangeOwningPlayer(NetUserId? newOwner)
{
var playerMgr = IoCManager.Resolve<IPlayerManager>();
PlayerData newOwnerData = null;
PlayerData? newOwnerData = null;
if (newOwner.HasValue)
{
if (!playerMgr.TryGetPlayerData(newOwner.Value, out var uncast))
@@ -264,7 +268,9 @@ namespace Content.Server.Mobs
if (UserId.HasValue)
{
playerMgr.GetPlayerData(UserId.Value).ContentData().Mind = null;
var data = playerMgr.GetPlayerData(UserId.Value).ContentData();
DebugTools.AssertNotNull(data);
data!.Mind = null;
}
UserId = newOwner;
@@ -275,7 +281,8 @@ namespace Content.Server.Mobs
// Yank new owner out of their old mind too.
// Can I mention how much I love the word yank?
newOwnerData.Mind?.ChangeOwningPlayer(null);
DebugTools.AssertNotNull(newOwnerData);
newOwnerData!.Mind?.ChangeOwningPlayer(null);
newOwnerData.Mind = this;
}
@@ -300,10 +307,17 @@ namespace Content.Server.Mobs
// Null this before removing the component to avoid any infinite loops.
VisitingEntity = null;
if (oldVisitingEnt.HasComponent<VisitingMindComponent>())
DebugTools.AssertNotNull(oldVisitingEnt);
if (oldVisitingEnt!.HasComponent<VisitingMindComponent>())
{
oldVisitingEnt.RemoveComponent<VisitingMindComponent>();
}
}
public bool TryGetSession([NotNullWhen(true)] out IPlayerSession? session)
{
return (session = Session) != null;
}
}
}

11
Content.Server/Mobs/Roles/Job.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Server.Mobs.Roles
public override string Name { get; }
public override bool Antagonist => false;
public string StartingGear => Prototype.StartingGear;
public string? StartingGear => Prototype.StartingGear;
public Job(Mind mind, JobPrototype jobPrototype) : base(mind)
{
@@ -23,10 +23,11 @@ namespace Content.Server.Mobs.Roles
{
base.Greet();
var chat = IoCManager.Resolve<IChatManager>();
chat.DispatchServerMessage(Mind.Session, $"You're a new {Name}. Do your best!");
if (Mind.TryGetSession(out var session))
{
var chat = IoCManager.Resolve<IChatManager>();
chat.DispatchServerMessage(session, $"You're a new {Name}. Do your best!");
}
}
}
}

8
Content.Server/Mobs/Roles/Suspicion/SuspicionInnocentRole.cs
View File

@@ -24,8 +24,12 @@ namespace Content.Server.Mobs.Roles.Suspicion
base.Greet();
var chat = IoCManager.Resolve<IChatManager>();
chat.DispatchServerMessage(Mind.Session, $"You're an {Name}!");
chat.DispatchServerMessage(Mind.Session, $"Objective: {Objective}");
if (Mind.TryGetSession(out var session))
{
chat.DispatchServerMessage(session, $"You're an {Name}!");
chat.DispatchServerMessage(session, $"Objective: {Objective}");
}
}
}
}

21
Content.Server/Mobs/Roles/Suspicion/SuspicionTraitorRole.cs
View File

@@ -23,18 +23,21 @@ namespace Content.Server.Mobs.Roles.Suspicion
public void GreetSuspicion(List<SuspicionTraitorRole> traitors, IChatManager chatMgr)
{
chatMgr.DispatchServerMessage(Mind.Session, Loc.GetString("suspicion-role-greeting", ("roleName", Name)));
chatMgr.DispatchServerMessage(Mind.Session, Loc.GetString("suspicion-objective", ("objectiveText", Objective)));
if (Mind.TryGetSession(out var session))
{
chatMgr.DispatchServerMessage(session, Loc.GetString("suspicion-role-greeting", ("roleName", Name)));
chatMgr.DispatchServerMessage(session, Loc.GetString("suspicion-objective", ("objectiveText", Objective)));
var allPartners = string.Join(", ", traitors.Where(p => p != this).Select(p => p.Mind.CharacterName));
var allPartners = string.Join(", ", traitors.Where(p => p != this).Select(p => p.Mind.CharacterName));
var partnerText = Loc.GetString(
"suspicion-partners-in-crime",
("partnerCount", traitors.Count-1),
("partnerNames", allPartners)
);
var partnerText = Loc.GetString(
"suspicion-partners-in-crime",
("partnerCount", traitors.Count-1),
("partnerNames", allPartners)
);
chatMgr.DispatchServerMessage(Mind.Session, partnerText);
chatMgr.DispatchServerMessage(session, partnerText);
}
}
}
}

9
Content.Server/Mobs/Roles/Traitor/TraitorRole.cs
View File

@@ -15,9 +15,12 @@ namespace Content.Server.Mobs.Roles.Traitor
public void GreetTraitor(string[] codewords)
{
var chatMgr = IoCManager.Resolve<IChatManager>();
chatMgr.DispatchServerMessage(Mind.Session, Loc.GetString("Hello Agent!"));
chatMgr.DispatchServerMessage(Mind.Session, Loc.GetString("Your codewords are: {0}", string.Join(", ",codewords)));
if (Mind.TryGetSession(out var session))
{
var chatMgr = IoCManager.Resolve<IChatManager>();
chatMgr.DispatchServerMessage(session, Loc.GetString("Hello Agent!"));
chatMgr.DispatchServerMessage(session, Loc.GetString("Your codewords are: {0}", string.Join(", ",codewords)));
}
}
}
}