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

Fix exception in drink food visualizer.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-04-25 14:40:57 +02:00
parent a5de12e4cf
commit 8e91215d6f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer2D.cs
View File

@@ -23,12 +23,12 @@ namespace Content.Client.GameObjects.Components.Nutrition
public override void OnChangeData(AppearanceComponent component) public override void OnChangeData(AppearanceComponent component)
{ {
var sprite = component.Owner.GetComponent<ISpriteComponent>(); var sprite = component.Owner.GetComponent<ISpriteComponent>();
if (!component.TryGetData<int>(SharedFoodComponent.FoodVisuals.MaxUses, out var maxUses)) if (!component.TryGetData<float>(SharedFoodComponent.FoodVisuals.MaxUses, out var maxUses))
{ {
return; return;
} }
if (component.TryGetData<int>(SharedFoodComponent.FoodVisuals.Visual, out var usesLeft)) if (component.TryGetData<float>(SharedFoodComponent.FoodVisuals.Visual, out var usesLeft))
{ {
var step = ContentHelpers.RoundToLevels(usesLeft, maxUses, _steps); var step = ContentHelpers.RoundToLevels(usesLeft, maxUses, _steps);
sprite.LayerSetState(0, $"icon-{step}"); sprite.LayerSetState(0, $"icon-{step}");

4
Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs
View File

@@ -80,13 +80,13 @@ namespace Content.Server.GameObjects.Components.Nutrition
_drinking = false; _drinking = false;
Owner.TryGetComponent(out AppearanceComponent appearance); Owner.TryGetComponent(out AppearanceComponent appearance);
_appearanceComponent = appearance; _appearanceComponent = appearance;
_appearanceComponent?.SetData(SharedFoodComponent.FoodVisuals.MaxUses, MaxVolume); _appearanceComponent?.SetData(SharedFoodComponent.FoodVisuals.MaxUses, MaxVolume.Float());
_updateAppearance(); _updateAppearance();
} }
private void _updateAppearance() private void _updateAppearance()
{ {
_appearanceComponent?.SetData(SharedFoodComponent.FoodVisuals.Visual, UsesLeft()); _appearanceComponent?.SetData(SharedFoodComponent.FoodVisuals.Visual, _contents.CurrentVolume.Float());
} }
bool IUse.UseEntity(UseEntityEventArgs eventArgs) bool IUse.UseEntity(UseEntityEventArgs eventArgs)