Move TriggerSystem trigger methods to shared #27970
Open
+161
−160
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AJCM-git
approved these changes
May 24, 2024
| { | ||
| // Check if entity is bomb/mod. grenade/etc | ||
| if (_container.TryGetContainer(uid, "payload", out var container) && |
There was a problem hiding this comment.
container id to const string
Comment on lines
+48
to
+56
| chemicalPayloadComponent.BeakerSlotB.Item is not { } beakerB || | ||
| !TryComp(beakerA, out SolutionContainerManagerComponent? containerA) || | ||
| !TryComp(beakerB, out SolutionContainerManagerComponent? containerB) || | ||
| !TryComp(beakerA, out FitsInDispenserComponent? fitsA) || | ||
| !TryComp(beakerB, out FitsInDispenserComponent? fitsB) || | ||
| !_solutions.TryGetSolution((beakerA, containerA), fitsA.Solution, out _, out var solutionA) || | ||
| !_solutions.TryGetSolution((beakerB, containerB), fitsB.Solution, out _, out var solutionB)) | ||
| return; |
There was a problem hiding this comment.
wtf is this (not a review since you didnt make... this, just a visceral reaction)
| User = user; | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Raised when timer trigger becomes active. | ||
| /// </summary> | ||
| [ByRefEvent] | ||
| public readonly record struct ActiveTimerTriggerEvent(EntityUid Triggered, EntityUid? User); |
There was a problem hiding this comment.
shouldnt this be removed now?
| [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; | ||
| [Dependency] private readonly SharedAppearanceSystem _appearance = default!; | ||
| [Dependency] private readonly SharedContainerSystem _container = default!; |
There was a problem hiding this comment.
_container can be protected
| /// <summary> | ||
| /// Raised when timer trigger becomes active. | ||
| /// </summary> | ||
| [ByRefEvent] | ||
| public readonly record struct ActiveTimerTriggerEvent(EntityUid Triggered, EntityUid? User); | ||
|
|
||
| [UsedImplicitly] | ||
| public sealed partial class TriggerSystem : EntitySystem | ||
| public sealed partial class TriggerSystem : SharedTriggerSystem | ||
| { | ||
| [Dependency] private readonly ExplosionSystem _explosions = default!; | ||
| [Dependency] private readonly FixtureSystem _fixtures = default!; |
There was a problem hiding this comment.
something tells me some of the deps below are unused now
AJCM-git
added
the
Status: Awaiting Changes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Media
Breaking changes
TriggerEvent has been moved from Content.Server.Explosion.EntitySystems to Content.Shared.Explosion