juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactors stacks to be fully ECS. (#4046)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-05-26 10:20:57 +02:00
committed by GitHub
parent 0f8e330a3d
commit 33fa208214
18 changed files with 494 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,20 +163,22 @@ namespace Content.Server.GameObjects.EntitySystems
case MaterialConstructionGraphStep materialStep:
foreach (var entity in EnumerateNearby(user))
{
if (!materialStep.EntityValid(entity, out var sharedStack))
if (!materialStep.EntityValid(entity, out var stack))
continue;
var stack = (StackComponent) sharedStack;
var splitStack = new StackSplitEvent()
{Amount = materialStep.Amount, SpawnPosition = user.ToCoordinates()};
RaiseLocalEvent(entity.Uid, splitStack);
if (!stack.Split(materialStep.Amount, user.ToCoordinates(), out var newStack))
if (splitStack.Result == null)
continue;
if (string.IsNullOrEmpty(materialStep.Store))
{
if (!container.Insert(newStack))
if (!container.Insert(splitStack.Result))
continue;
}
else if (!GetContainer(materialStep.Store).Insert(newStack))
else if (!GetContainer(materialStep.Store).Insert(splitStack.Result))
continue;
handled = true;
@@ -230,7 +232,7 @@ namespace Content.Server.GameObjects.EntitySystems
BreakOnStun = true,
BreakOnTargetMove = false,
BreakOnUserMove = true,
NeedHand = true,
NeedHand = false,
};
if (await doAfterSystem.DoAfter(doAfterArgs) == DoAfterStatus.Cancelled)