wega-team/ss14-wega
1
0
Fork 0
mirror of https://github.com/wega-team/ss14-wega.git synced 2026-06-09 10:06:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixfix

Browse Source
This commit is contained in:
Zekins3366
2026-05-30 23:18:13 +03:00
parent c230723e26
commit 55dd5d7dfd
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Server/_Wega/Damage/Systems/DamageInContainerSystem.cs
+5 -2
View File
@@ -59,7 +59,7 @@ public sealed class DamageInContainerSystem : EntitySystem
finalDamage = comp.Damage.Clone();
if (comp.DamageGroups != null && !comp.DamageGroups.Empty)
{
var groupsHeal = _damageable.CreateWeightedHealFromGroups(uid, comp.DamageGroups);
var groupsHeal = _damageable.CreateWeightedHealFromGroups(contained, comp.DamageGroups);
finalDamage += groupsHeal;
}
}
@@ -69,13 +69,16 @@ public sealed class DamageInContainerSystem : EntitySystem
}
else if (comp.DamageGroups != null && !comp.DamageGroups.Empty)
{
finalDamage = _damageable.CreateWeightedHealFromGroups(uid, comp.DamageGroups);
finalDamage = _damageable.CreateWeightedHealFromGroups(contained, comp.DamageGroups);
}
else
{
continue;
}
if (finalDamage == null)
continue;
if (TryComp<MobStateComponent>(contained, out var mobState))
{
foreach (var allowedState in comp.AllowedStates)
Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Bestia.cs
+2 -1
View File
@@ -210,7 +210,8 @@ public sealed partial class VampireSystem
if (!TryComp<EntityStorageComponent>(coffin, out var storage) || storage.Contents.ContainedEntities.Count == 0)
return;
foreach (var contentsEnt in storage.Contents.ContainedEntities)
var entities = storage.Contents.ContainedEntities.ToList();
foreach (var contentsEnt in entities)
{
_container.Remove(contentsEnt, storage.Contents);
_status.TryRemoveStatusEffect(contentsEnt, ForceSleeping);
Content.Shared/_Wega/Damage/Components/DamageInContainerComponent.cs
+2 -2
View File
@@ -15,10 +15,10 @@ public sealed partial class DamageInContainerComponent : Component
public float Interval = 1f;
[DataField, AutoNetworkedField]
public DamageSpecifier Damage = default!;
public DamageSpecifier? Damage = default!;
[DataField, AutoNetworkedField]
public GroupHealSpecifier DamageGroups = default!;
public GroupHealSpecifier? DamageGroups = default!;
[DataField]
public EntityWhitelist? Whitelist;