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

Revert "Ed 09 06 2024 upstream (#230)" (#233)

Browse Source 
This reverts commit 50470c3aaa.
This commit is contained in:
Ed
2024-06-11 15:19:27 +03:00
committed by GitHub
parent 36da152d73
commit b89117f8e6
402 changed files with 11291 additions and 21552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Construction/ConstructionSystem.cs
View File

@@ -27,7 +27,6 @@ namespace Content.Client.Construction
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly ExamineSystemShared _examineSystem = default!;
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!;
@@ -196,8 +195,9 @@ namespace Content.Client.Construction
if (GhostPresent(loc))
return false;
// This InRangeUnobstructed should probably be replaced with "is there something blocking us in that tile?"
var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager, _transformSystem));
if (!_examineSystem.InRangeUnOccluded(user, loc, 20f, predicate: predicate))
if (!_interactionSystem.InRangeUnobstructed(user, loc, 20f, predicate: predicate))
return false;
if (!CheckConstructionConditions(prototype, loc, dir, user, showPopup: true))