tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crayon decal spawning exception (#4355)

Browse Source 
* Fix crayon spawning

* Popup message
This commit is contained in:
mirrorcult
2021-07-25 01:44:26 -07:00
committed by GitHub
parent 9d36b3371f
commit ffee1482d9
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Crayon/CrayonComponent.cs
View File

@@ -124,9 +124,13 @@ namespace Content.Server.Crayon
return true; return true;
} }
var entityManager = IoCManager.Resolve<IServerEntityManager>(); if (!eventArgs.ClickLocation.IsValid(Owner.EntityManager))
{
eventArgs.User.PopupMessage(Loc.GetString("crayon-interact-invalid-location"));
return true;
}
var entity = entityManager.SpawnEntity("CrayonDecal", eventArgs.ClickLocation); var entity = Owner.EntityManager.SpawnEntity("CrayonDecal", eventArgs.ClickLocation);
if (entity.TryGetComponent(out AppearanceComponent? appearance)) if (entity.TryGetComponent(out AppearanceComponent? appearance))
{ {
appearance.SetData(CrayonVisuals.State, SelectedState); appearance.SetData(CrayonVisuals.State, SelectedState);

3
Resources/Locale/en-US/crayon/crayon-component.ftl
View File

@@ -3,6 +3,7 @@
crayon-drawing-label = Drawing: [color={$color}]{$state}[/color] ({$charges}/{$capacity}) crayon-drawing-label = Drawing: [color={$color}]{$state}[/color] ({$charges}/{$capacity})
crayon-interact-not-enough-left-text = Not enough left. crayon-interact-not-enough-left-text = Not enough left.
crayon-interact-invalid-location = Can't reach there!
## UI ## UI
crayon-window-title = Crayon crayon-window-title = Crayon