Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix pneumatic cannon (#7902)

Browse Source
This commit is contained in:
Kara
2022-05-02 19:53:03 -07:00
committed by GitHub
parent 5cfbac805b
commit 60c1614393
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
View File

@@ -225,7 +225,7 @@ namespace Content.Server.PneumaticCannon
if (storage.StoredEntities.Count == 0) return; // click sound? if (storage.StoredEntities.Count == 0) return; // click sound?
var ent = _random.Pick(storage.StoredEntities); var ent = _random.Pick(storage.StoredEntities);
storage.Remove(ent); _storageSystem.RemoveAndDrop(comp.Owner, ent, storage);
SoundSystem.Play(Filter.Pvs(data.User), comp.FireSound.GetSound(), ((IComponent) comp).Owner, AudioParams.Default); SoundSystem.Play(Filter.Pvs(data.User), comp.FireSound.GetSound(), ((IComponent) comp).Owner, AudioParams.Default);
if (EntityManager.HasComponent<CameraRecoilComponent>(data.User)) if (EntityManager.HasComponent<CameraRecoilComponent>(data.User))
@@ -333,7 +333,7 @@ namespace Content.Server.PneumaticCannon
if (storage.StoredEntities == null) return; if (storage.StoredEntities == null) return;
foreach (var entity in storage.StoredEntities.ToArray()) foreach (var entity in storage.StoredEntities.ToArray())
{ {
storage.Remove(entity); _storageSystem.RemoveAndDrop(component.Owner, entity, storage);
} }
user.PopupMessage(Loc.GetString("pneumatic-cannon-component-ejected-all", user.PopupMessage(Loc.GetString("pneumatic-cannon-component-ejected-all",