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

Predict helmet toggles (#22089)

Browse Source
This commit is contained in:
metalgearsloth
2023-12-06 17:59:31 +11:00
committed by GitHub
parent 7cd5bf33aa
commit 8583f0d565
4 changed files with 40 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Content.Shared/Inventory/InventorySystem.Equip.cs
View File

@@ -198,21 +198,8 @@ public abstract partial class InventorySystem
return false;
}
if(!silent && clothing != null && clothing.EquipSound != null && _gameTiming.IsFirstTimePredicted)
if (!silent && clothing != null && clothing.EquipSound != null)
{
Filter filter;
if (_netMan.IsClient)
filter = Filter.Local();
else
{
filter = Filter.Pvs(target);
// don't play double audio for predicted interactions
if (predicted)
filter.RemoveWhereAttachedEntity(entity => entity == actor);
}
_audio.PlayPredicted(clothing.EquipSound, target, actor);
}
@@ -385,23 +372,13 @@ public abstract partial class InventorySystem
if (!slotContainer.Remove(removedItem.Value, force: force))
return false;
_transform.DropNextTo(removedItem.Value, target);
// TODO: Inventory needs a hot cleanup hoo boy
// Check if something else (AKA toggleable) dumped it into a container.
if (!_containerSystem.IsEntityInContainer(removedItem.Value))
_transform.DropNextTo(removedItem.Value, target);
if (!silent && Resolve(removedItem.Value, ref clothing, false) && clothing.UnequipSound != null && _gameTiming.IsFirstTimePredicted)
if (!silent && Resolve(removedItem.Value, ref clothing, false) && clothing.UnequipSound != null)
{
Filter filter;
if (_netMan.IsClient)
filter = Filter.Local();
else
{
filter = Filter.Pvs(target);
// don't play double audio for predicted interactions
if (predicted)
filter.RemoveWhereAttachedEntity(entity => entity == actor);
}
_audio.PlayPredicted(clothing.UnequipSound, target, actor);
}