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

Fix misc bugs (#15314)

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-12 12:18:30 +12:00
committed by GitHub
parent d068c4f36b
commit 21378f6e41
9 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Tools/ToolSystem.LatticeCutting.cs
View File

@@ -54,7 +54,7 @@ public sealed partial class ToolSystem
private bool TryCut(EntityUid toolEntity, EntityUid user, LatticeCuttingComponent component, EntityCoordinates clickLocation)
{
if (!_mapManager.TryGetGrid(clickLocation.GetGridUid(EntityManager), out var mapGrid))
if (!_mapManager.TryFindGridAt(clickLocation.ToMap(EntityManager, _transformSystem), out var mapGrid))
return false;
var tile = mapGrid.GetTileRef(clickLocation);
@@ -71,7 +71,7 @@ public sealed partial class ToolSystem
|| tile.IsBlockedTurf(true))
return false;
var ev = new LatticeCuttingCompleteEvent(clickLocation);
var ev = new LatticeCuttingCompleteEvent(coordinates);
return UseTool(toolEntity, user, toolEntity, component.Delay, component.QualityNeeded, ev);
}
}

4
Content.Server/Tools/ToolSystem.TilePrying.cs
View File

@@ -52,7 +52,7 @@ public sealed partial class ToolSystem
if (!TryComp<ToolComponent?>(toolEntity, out var tool) && component.ToolComponentNeeded)
return false;
if (!_mapManager.TryGetGrid(clickLocation.GetGridUid(EntityManager), out var mapGrid))
if (!_mapManager.TryFindGridAt(clickLocation.ToMap(EntityManager, _transformSystem), out var mapGrid))
return false;
var tile = mapGrid.GetTileRef(clickLocation);
@@ -67,7 +67,7 @@ public sealed partial class ToolSystem
if (!tileDef.CanCrowbar)
return false;
var ev = new TilePryingDoAfterEvent(clickLocation);
var ev = new TilePryingDoAfterEvent(coordinates);
return UseTool(toolEntity, user, toolEntity, component.Delay, component.QualityNeeded, ev, toolComponent: tool);
}