From f676e8c67ef2c7e007bd2dc0a6a0272405d46f7f Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 3 Apr 2019 16:22:26 +0300 Subject: [PATCH] (914a15437) Fixed: Checking for jobs using name instead of the prefab identifier --- .../GameSession/GameModes/Tutorials/ContextualTutorial.cs | 2 +- .../Source/Items/Components/Signal/LightComponent.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs index 6eb4648fe..d8ac5bc80 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs @@ -627,7 +627,7 @@ namespace Barotrauma.Tutorials job = job.ToLowerInvariant(); for (int i = 0; i < crew.Count; i++) { - if (crew[i].Info.Job.Name.ToLowerInvariant() == job) return crew[i]; + if (crew[i].Info.Job.Prefab.Identifier.ToLowerInvariant() == job) return crew[i]; } return null; diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs index 7845f609c..eebf1146a 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs @@ -26,6 +26,10 @@ namespace Barotrauma.Items.Components private float blinkTimer; + private bool itemLoaded; + + private float blinkTimer; + public PhysicsBody ParentBody; [Editable(MinValueFloat = 0.0f, MaxValueFloat = 2048.0f), Serialize(100.0f, true)]