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

Enable nullability in Content.Shared (#3626)

Browse Source 
* Enable nullability in Content.Shared

* Fix null errors in server

* aye github i swear on me mom
This commit is contained in:
DrSmugleaf
2021-03-15 21:55:49 +01:00
committed by GitHub
parent 04201e944c
commit 6f012cb9ad
31 changed files with 167 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs
View File

@@ -66,7 +66,7 @@ namespace Content.Server.AI.Operators.Inventory
if (storageComponent.Open)
{
var activateArgs = new ActivateEventArgs {User = _owner, Target = _target};
var activateArgs = new ActivateEventArgs(_owner, _target);
storageComponent.Activate(activateArgs);
}

2
Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Server.AI.Operators.Inventory
if (!storageComponent.Open)
{
var activateArgs = new ActivateEventArgs {User = _owner, Target = _target};
var activateArgs = new ActivateEventArgs(_owner, _target);
storageComponent.Activate(activateArgs);
}

2
Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs
View File

@@ -239,7 +239,7 @@ namespace Content.Server.GameObjects.Components.Atmos
var activeHandEntity = handsComponent.GetActiveHand?.Owner;
if (activeHandEntity == null || !activeHandEntity.TryGetComponent(out GasAnalyzerComponent? gasAnalyzer))
{
serverMsg.Session.AttachedEntity.PopupMessage(Loc.GetString("You need a Gas Analyzer in your hand!"));
serverMsg.Session.AttachedEntity?.PopupMessage(Loc.GetString("You need a Gas Analyzer in your hand!"));
return;
}

2
Content.Server/GameObjects/Components/Body/MechanismComponent.cs
View File

@@ -88,7 +88,7 @@ namespace Content.Server.GameObjects.Components.Body
}
else // If surgery cannot be performed, show message saying so.
{
eventArgs.Target.PopupMessage(eventArgs.User,
eventArgs.Target?.PopupMessage(eventArgs.User,
Loc.GetString("You see no way to install the {0}.", Owner.Name));
}
}

2
Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs
View File

@@ -155,7 +155,7 @@ namespace Content.Server.GameObjects.Components.Body.Part
}
else // If surgery cannot be performed, show message saying so.
{
eventArgs.Target.PopupMessage(eventArgs.User,
eventArgs.Target?.PopupMessage(eventArgs.User,
Loc.GetString("You see no way to install {0:theName}.", Owner));
}
}

12
Content.Server/GameObjects/Components/Body/Surgery/SurgeryToolComponent.cs
View File

@@ -16,8 +16,6 @@ using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -246,7 +244,9 @@ namespace Content.Server.GameObjects.Components.Body.Surgery
private void HandleReceiveMechanism(int key)
{
// TODO: sanity checks to see whether user is in range, user is still able-bodied, target is still the same, etc etc
if (!_optionsCache.TryGetValue(key, out var targetObject) ||
if (BodyCache == null ||
!_optionsCache.TryGetValue(key, out var targetObject) ||
targetObject is not MechanismComponent target ||
PerformerCache == null ||
!PerformerCache.TryGetComponent(out IActorComponent? actor))
{
@@ -254,20 +254,22 @@ namespace Content.Server.GameObjects.Components.Body.Surgery
return;
}
var target = targetObject as MechanismComponent;
CloseSurgeryUI(actor.playerSession);
_callbackCache?.Invoke(target, BodyCache, this, PerformerCache);
}
private void NotUsefulPopup()
{
if (PerformerCache == null) return;
BodyCache?.Owner.PopupMessage(PerformerCache,
Loc.GetString("You see no useful way to use {0:theName}.", Owner));
}
private void NotUsefulAnymorePopup()
{
if (PerformerCache == null) return;
BodyCache?.Owner.PopupMessage(PerformerCache,
Loc.GetString("You see no useful way to use {0:theName} anymore.", Owner));
}

5
Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
View File

@@ -13,7 +13,6 @@ using Content.Shared.GameObjects.Components.Strap;
using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Content.Shared.GameObjects.Verbs;
using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Utility;
using Robust.Server.GameObjects;
using Robust.Shared.Containers;
@@ -237,7 +236,7 @@ namespace Content.Server.GameObjects.Components.Buckle
public override bool TryBuckle(IEntity? user, IEntity to)
{
if (!CanBuckle(user, to, out var strap))
if (user == null || !CanBuckle(user, to, out var strap))
{
return false;
}
@@ -410,7 +409,7 @@ namespace Content.Server.GameObjects.Components.Buckle
return new BuckleComponentState(Buckled, drawDepth, LastEntityBuckledTo, DontCollide);
}
public void Update()
{
if (!DontCollide || Physics == null)

10
Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
View File

@@ -15,8 +15,6 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Network;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -201,11 +199,11 @@ namespace Content.Server.GameObjects.Components.Instruments
{
if (_laggedBatches == (int) (maxMidiLaggedBatches * (1 / 3d) + 1))
{
Owner.PopupMessage(InstrumentPlayer.AttachedEntity,
InstrumentPlayer.AttachedEntity?.PopupMessage(
Loc.GetString("Your fingers are beginning to a cramp a little!"));
} else if (_laggedBatches == (int) (maxMidiLaggedBatches * (2 / 3d) + 1))
{
Owner.PopupMessage(InstrumentPlayer.AttachedEntity,
InstrumentPlayer.AttachedEntity?.PopupMessage(
Loc.GetString("Your fingers are seriously cramping up!"));
}
}
@@ -360,11 +358,11 @@ namespace Content.Server.GameObjects.Components.Instruments
stun.Stun(1);
Clean();
}
Owner.PopupMessage(mob, "Your fingers cramp up from playing!");
}
InstrumentPlayer = null;
Owner.PopupMessage(mob, "Your fingers cramp up from playing!");
}
_timer += delta;

14
Content.Server/GameObjects/Components/Interactable/WelderComponent.cs
View File

@@ -21,8 +21,6 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
@@ -139,20 +137,24 @@ namespace Content.Server.GameObjects.Components.Interactable
{
if (!WelderLit)
{
if(!silent) Owner.PopupMessage(user, Loc.GetString("The welder is turned off!"));
if (!silent && user != null)
Owner.PopupMessage(user, Loc.GetString("The welder is turned off!"));
return false;
}
if (!CanWeld(value))
{
if(!silent) Owner.PopupMessage(user, Loc.GetString("The welder does not have enough fuel for that!"));
if (!silent && user != null)
Owner.PopupMessage(user, Loc.GetString("The welder does not have enough fuel for that!"));
return false;
}
if (_solutionComponent == null)
return false;
bool succeeded = _solutionComponent.TryRemoveReagent("chem.WeldingFuel", ReagentUnit.New(value));
var succeeded = _solutionComponent.TryRemoveReagent("chem.WeldingFuel", ReagentUnit.New(value));
if (succeeded && !silent)
{
@@ -192,7 +194,7 @@ namespace Content.Server.GameObjects.Components.Interactable
return true;
}
if (!CanLitWelder())
if (!CanLitWelder() && user != null)
{
Owner.PopupMessage(user, Loc.GetString("The welder has no fuel left!"));
return false;

4
Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
View File

@@ -23,8 +23,6 @@ using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -481,7 +479,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
void IActivate.Activate(ActivateEventArgs eventArgs)
{
((IUse) this).UseEntity(new UseEntityEventArgs { User = eventArgs.User });
((IUse) this).UseEntity(new UseEntityEventArgs(eventArgs.User));
}
/// <summary>

8
Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs
View File

@@ -15,13 +15,9 @@ namespace Content.Server.GameObjects.Components.Morgue
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if(Morgue != null && !Morgue.Deleted && Morgue.TryGetComponent<MorgueEntityStorageComponent>(out var comp))
if (Morgue != null && !Morgue.Deleted && Morgue.TryGetComponent<MorgueEntityStorageComponent>(out var comp))
{
comp.Activate(new ActivateEventArgs()
{
User = eventArgs.User,
Target = Morgue
});
comp.Activate(new ActivateEventArgs(eventArgs.User, Morgue));
}
}
}

18
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Items.Storage;
@@ -26,7 +25,6 @@ using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Players;
namespace Content.Server.GameObjects.EntitySystems.Click
@@ -143,7 +141,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
}
// all activates should only fire when in range / unbostructed
var activateEventArgs = new ActivateEventArgs { User = user, Target = used };
var activateEventArgs = new ActivateEventArgs(user, used);
if (activateEventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true))
{
activateComp.Activate(activateEventArgs);
@@ -432,10 +430,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
return;
var attackBys = attacked.GetAllComponents<IInteractUsing>().OrderByDescending(x => x.Priority);
var attackByEventArgs = new InteractUsingEventArgs
{
User = user, ClickLocation = clickLocation, Using = weapon, Target = attacked
};
var attackByEventArgs = new InteractUsingEventArgs(user, clickLocation, weapon, attacked);
// all AttackBys should only happen when in range / unobstructed, so no range check is needed
if (attackByEventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true))
@@ -474,7 +469,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
if (message.Handled)
return;
var attackHandEventArgs = new InteractHandEventArgs { User = user, Target = attacked };
var attackHandEventArgs = new InteractHandEventArgs(user, attacked);
// all attackHands should only fire when in range / unobstructed
if (attackHandEventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true))
@@ -534,7 +529,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
// Try to use item on any components which have the interface
foreach (var use in uses)
{
if (use.UseEntity(new UseEntityEventArgs { User = user }))
if (use.UseEntity(new UseEntityEventArgs(user)))
{
// If a Use returns a status completion we finish our attack
return;
@@ -753,10 +748,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
return;
var rangedAttackBys = attacked.GetAllComponents<IRangedInteract>().ToList();
var rangedAttackByEventArgs = new RangedInteractEventArgs
{
User = user, Using = weapon, ClickLocation = clickLocation
};
var rangedAttackByEventArgs = new RangedInteractEventArgs(user, weapon, clickLocation);
// See if we have a ranged attack interaction
foreach (var t in rangedAttackBys)

9
Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs
View File

@@ -352,11 +352,18 @@ namespace Content.Server.GameObjects.EntitySystems
return;
}
var user = args.SenderSession.AttachedEntity;
if (user == null)
{
Logger.Error($"Client sent {nameof(TryStartStructureConstructionMessage)} with no attached entity!");
return;
}
var startNode = constructionGraph.Nodes[constructionPrototype.StartNode];
var targetNode = constructionGraph.Nodes[constructionPrototype.TargetNode];
var pathFind = constructionGraph.Path(startNode.Name, targetNode.Name);
var user = args.SenderSession.AttachedEntity;
if (_beingBuilt.TryGetValue(args.SenderSession, out var set))
{

2
Content.Server/GameObjects/EntitySystems/PointingSystem.cs
View File

@@ -69,7 +69,7 @@ namespace Content.Server.GameObjects.EntitySystems
? viewerPointedAtMessage
: viewerMessage;
source.PopupMessage(viewer.AttachedEntity, message);
source.PopupMessage(viewerEntity, message);
}
}