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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
View File

@@ -32,29 +32,29 @@ namespace Content.Server.Nutrition.EntitySystems
/// </summary>
private void OnAfterInteract(EntityUid uid, UtensilComponent component, AfterInteractEvent ev)
{
if (ev.Target == null)
if (ev.Target == default)
return;
if (TryUseUtensil(ev.UserUid, ev.Target, component))
if (TryUseUtensil(ev.User, ev.Target.Value, component))
ev.Handled = true;
}
private bool TryUseUtensil(EntityUid userUid, EntityUid targetUid, UtensilComponent component)
private bool TryUseUtensil(EntityUid user, EntityUid target, UtensilComponent component)
{
if (!EntityManager.TryGetComponent(targetUid, out FoodComponent food))
if (!EntityManager.TryGetComponent(target, out FoodComponent food))
return false;
//Prevents food usage with a wrong utensil
if ((food.Utensil & component.Types) == 0)
{
_popupSystem.PopupEntity(Loc.GetString("food-system-wrong-utensil", ("food", food.Owner), ("utensil", component.Owner)), userUid, Filter.Entities(userUid));
_popupSystem.PopupEntity(Loc.GetString("food-system-wrong-utensil", ("food", food.Owner), ("utensil", component.Owner)), user, Filter.Entities(user));
return false;
}
if (!userUid.InRangeUnobstructed(targetUid, popup: true))
if (!user.InRangeUnobstructed(target, popup: true))
return false;
return _foodSystem.TryUseFood(targetUid, userUid);
return _foodSystem.TryUseFood(target, user);
}
/// <summary>
@@ -70,7 +70,7 @@ namespace Content.Server.Nutrition.EntitySystems
if (_robustRandom.Prob(component.BreakChance))
{
SoundSystem.Play(Filter.Pvs(userUid), component.BreakSound.GetSound(), userUid, AudioParams.Default.WithVolume(-2f));
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) component.Owner);
IoCManager.Resolve<IEntityManager>().DeleteEntity(component.Owner);
}
}
}