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

DoAfter and other bugfixes (#14669)

Browse Source
This commit is contained in:
Leon Friedrich
2023-03-15 15:05:53 +13:00
committed by GitHub
parent 5df1d6194f
commit 2f88173730
6 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Tiles/FloorTileSystem.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.Tiles
private void OnAfterInteract(EntityUid uid, FloorTileComponent component, AfterInteractEvent args)
{
if (!args.CanReach)
if (!args.CanReach || args.Handled)
return;
if (!TryComp<StackComponent>(uid, out var stack))
@@ -72,6 +72,8 @@ namespace Content.Server.Tiles
continue;
PlaceAt(mapGrid, location, currentTileDefinition.TileId, component.PlaceTileSound);
args.Handled = true;
return;
}
}
else if (HasBaseTurf(currentTileDefinition, ContentTileDefinition.SpaceID))
@@ -81,6 +83,8 @@ namespace Content.Server.Tiles
gridXform.WorldPosition = locationMap.Position;
location = new EntityCoordinates(mapGrid.Owner, Vector2.Zero);
PlaceAt(mapGrid, location, _tileDefinitionManager[component.OutputTiles[0]].TileId, component.PlaceTileSound, mapGrid.TileSize / 2f);
args.Handled = true;
return;
}
}
}