tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

16
Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs
View File

@@ -1,17 +1,15 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Stack;
using Content.Shared.Audio;
using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Maps;
using Content.Shared.Utility;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
using System.Collections.Generic;
using System.Threading.Tasks;
using Robust.Server.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.GameObjects.Components.Items
@@ -23,7 +21,7 @@ namespace Content.Server.GameObjects.Components.Items
public override string Name => "FloorTile";
[DataField("outputs")]
private List<string> _outputTiles;
private List<string>? _outputTiles;
public override void Initialize()
{
@@ -55,7 +53,7 @@ namespace Content.Server.GameObjects.Components.Items
if (!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true))
return true;
if (!Owner.TryGetComponent(out StackComponent stack))
if (!Owner.TryGetComponent(out StackComponent? stack))
return true;
var mapManager = IoCManager.Resolve<IMapManager>();
@@ -65,6 +63,10 @@ namespace Content.Server.GameObjects.Components.Items
if (locationMap.MapId == MapId.Nullspace)
return true;
mapManager.TryGetGrid(location.GetGridId(Owner.EntityManager), out var mapGrid);
if (_outputTiles == null)
return true;
foreach (var currentTile in _outputTiles)
{
var currentTileDefinition = (ContentTileDefinition) _tileDefinitionManager[currentTile];