Skip to content

Commit

Permalink
Fix duplicate
Browse files Browse the repository at this point in the history
  • Loading branch information
sleepyyapril committed Jan 14, 2025
1 parent b257eb8 commit c9001bc
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
Original file line number Diff line number Diff line change
Expand Up @@ -406,17 +406,6 @@ private void UpdateFTLStarting(Entity<FTLComponent, ShuttleComponent> entity)
clippedAudio.Value.Component.Flags |= AudioFlags.NoOcclusion;
}

// Leave audio at the old spot
// Just so we don't clip
if (fromMapUid != null && TryComp(comp.StartupStream, out AudioComponent? startupAudio))
{
var clippedAudio = _audio.PlayStatic(_startupSound, Filter.Broadcast(),
new EntityCoordinates(fromMapUid.Value, _maps.GetGridPosition(entity.Owner)), true, startupAudio.Params);

_audio.SetPlaybackPosition(clippedAudio, entity.Comp1.StartupTime);
clippedAudio.Value.Component.Flags |= AudioFlags.NoOcclusion;
}

// Offset the start by buffer range just to avoid overlap.
var ftlStart = new EntityCoordinates(ftlMap, new Vector2(_index + width / 2f, 0f) - shuttleCenter);

Expand Down Expand Up @@ -1038,4 +1027,4 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
var ev = new ShuttleFlattenEvent(xform.MapUid.Value, aabbs);
RaiseLocalEvent(ref ev);
}
}
}

0 comments on commit c9001bc

Please sign in to comment.