Content update for NetEntities (#18935)

This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions

View File

@@ -26,11 +26,12 @@ public sealed partial class ToolSystem
if (args.Cancelled)
return;
var gridUid = args.Coordinates.GetGridUid(EntityManager);
var coords = GetCoordinates(args.Coordinates);
var gridUid = coords.GetGridUid(EntityManager);
if (gridUid == null)
return;
var grid = _mapManager.GetGrid(gridUid.Value);
var tile = grid.GetTileRef(args.Coordinates);
var tile = grid.GetTileRef(coords);
if (_tileDefinitionManager[tile.Tile.TypeId] is not ContentTileDefinition tileDef
|| !tileDef.CanWirecutter
@@ -69,9 +70,11 @@ public sealed partial class ToolSystem
|| string.IsNullOrEmpty(tileDef.BaseTurf)
|| _tileDefinitionManager[tileDef.BaseTurf] is not ContentTileDefinition newDef
|| tile.IsBlockedTurf(true))
{
return false;
}
var ev = new LatticeCuttingCompleteEvent(coordinates);
var ev = new LatticeCuttingCompleteEvent(GetNetCoordinates(coordinates));
return UseTool(toolEntity, user, toolEntity, component.Delay, component.QualityNeeded, ev);
}
}