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

Fix construction from inside containers (#4595)

Browse Source 
* Disallow construction of construction ghosts from inside a container

* Move IsInContainer check to before doing container ensuring

* Move IsInContainer check to HandleStartStructureConstruction to allow building items but not construct structures when inside a cozy locker

* Update Resources/Locale/en-US/construction/construction-system.ftl

Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
Mads Glahder
2021-09-18 10:38:42 +02:00
committed by GitHub
parent 5ece3d7747
commit 08cfc3bb46
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Construction/ConstructionSystem.cs
View File

@@ -395,6 +395,7 @@ namespace Content.Server.Construction
private async void HandleStartStructureConstruction(TryStartStructureConstructionMessage ev, EntitySessionEventArgs args) private async void HandleStartStructureConstruction(TryStartStructureConstructionMessage ev, EntitySessionEventArgs args)
{ {
if (!_prototypeManager.TryIndex(ev.PrototypeName, out ConstructionPrototype? constructionPrototype)) if (!_prototypeManager.TryIndex(ev.PrototypeName, out ConstructionPrototype? constructionPrototype))
{ {
Logger.Error($"Tried to start construction of invalid recipe '{ev.PrototypeName}'!"); Logger.Error($"Tried to start construction of invalid recipe '{ev.PrototypeName}'!");
@@ -417,6 +418,12 @@ namespace Content.Server.Construction
return; return;
} }
if (user.IsInContainer())
{
user.PopupMessageCursor(Loc.GetString("construction-system-inside-container"));
return;
}
var startNode = constructionGraph.Nodes[constructionPrototype.StartNode]; var startNode = constructionGraph.Nodes[constructionPrototype.StartNode];
var targetNode = constructionGraph.Nodes[constructionPrototype.TargetNode]; var targetNode = constructionGraph.Nodes[constructionPrototype.TargetNode];
var pathFind = constructionGraph.Path(startNode.Name, targetNode.Name); var pathFind = constructionGraph.Path(startNode.Name, targetNode.Name);

3
Resources/Locale/en-US/construction/construction-system.ftl
View File

@@ -2,4 +2,5 @@
construction-system-construct-cannot-start-another-construction = You can't start another construction now! construction-system-construct-cannot-start-another-construction = You can't start another construction now!
construction-system-construct-no-materials = You don't have the materials to build that! construction-system-construct-no-materials = You don't have the materials to build that!
construction-system-already-building = You are already building that! construction-system-already-building = You are already building that!
construction-system-inside-container = You can't build while you're there!