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/Chemistry/Metabolism/DefaultDrink.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.Chemistry.Metabolism
ReagentUnit IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
{
var metabolismAmount = MetabolismRate * tickTime;
if (solutionEntity.TryGetComponent(out ThirstComponent thirst))
if (solutionEntity.TryGetComponent(out ThirstComponent? thirst))
thirst.UpdateThirst(metabolismAmount.Float() * HydrationFactor);
//Return amount of reagent to be removed, remove reagent regardless of ThirstComponent presence

2
Content.Server/Chemistry/Metabolism/DefaultFood.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.Chemistry.Metabolism
ReagentUnit IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
{
var metabolismAmount = MetabolismRate * tickTime;
if (solutionEntity.TryGetComponent(out HungerComponent hunger))
if (solutionEntity.TryGetComponent(out HungerComponent? hunger))
hunger.UpdateFood(metabolismAmount.Float() * NutritionFactor);
//Return amount of reagent to be removed, remove reagent regardless of HungerComponent presence

6
Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
View File

@@ -26,12 +26,12 @@ namespace Content.Server.Chemistry.ReactionEffects
/// </summary>
[DataField("maxScale")] private float _maxScale = 1;
public void React(IEntity solutionEntity, double intensity)
public void React(IEntity? solutionEntity, double intensity)
{
var floatIntensity = (float)intensity;
var floatIntensity = (float) intensity;
if (solutionEntity == null)
return;
if(!solutionEntity.TryGetComponent(out SolutionContainerComponent solution))
if (!solutionEntity.HasComponent<SolutionContainerComponent>())
return;
//Handle scaling

2
Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.Chemistry.TileReactions
var amount = ReagentUnit.Zero;
foreach (var entity in entities)
{
if (entity.TryGetComponent(out CleanableComponent cleanable))
if (entity.TryGetComponent(out CleanableComponent? cleanable))
{
var next = amount + cleanable.CleanAmount;
// Nothing left?

2
Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Server.Chemistry.TileReactions
{
if (reactVolume <= ReagentUnit.Zero || tile.Tile.IsEmpty) return ReagentUnit.Zero;
var tileAtmos = tile.GridIndices.GetTileAtmosphere(tile.GridIndex);
if (tileAtmos == null || !tileAtmos.Hotspot.Valid) return ReagentUnit.Zero;
if (tileAtmos == null || !tileAtmos.Hotspot.Valid || tileAtmos.Air == null) return ReagentUnit.Zero;
tileAtmos.Air.Temperature =
MathF.Max(MathF.Min(tileAtmos.Air.Temperature - (_coolingTemperature * 1000f),
tileAtmos.Air.Temperature / _coolingTemperature),

2
Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Server.Chemistry.TileReactions
{
if (reactVolume <= ReagentUnit.Zero || tile.Tile.IsEmpty) return ReagentUnit.Zero;
var tileAtmos = tile.GridIndices.GetTileAtmosphere(tile.GridIndex);
if (tileAtmos == null || !tileAtmos.Hotspot.Valid) return ReagentUnit.Zero;
if (tileAtmos?.Air == null || !tileAtmos.Hotspot.Valid) return ReagentUnit.Zero;
tileAtmos.Air.Temperature *= MathF.Max(_temperatureMultiplier * reactVolume.Float(), 1f);
tileAtmos.Air.React(tileAtmos);
return reactVolume;