Adds ability to listen to cancelled events #6207
Merged
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
Adds functionality to allow events to listen to cancelled events only, uncancelled only (previous behavior), and both. Deprecates listenCancelled (breaking change for EvtResurrect)
sovdeeth
added
enhancement
UnderscoreTud
requested changes
Nov 30, 2023
Co-authored-by: _tud <[email protected]>
Pikachu920
reviewed
Nov 30, 2023
Removes breaking change from EvtResurrect. Refactors some of SkriptEventHandler Errors for events that don't support cancelling Bug fix for data leak via EventData
Fusezion
reviewed
Dec 1, 2023
Fusezion
suggested changes
Dec 3, 2023
…led. Reduce local complexity in SkriptEventHandler
Fusezion
approved these changes
Dec 5, 2023
UnderscoreTud
approved these changes
Dec 6, 2023
Pikachu920
reviewed
Dec 11, 2023
Co-authored-by: Patrick Miller <[email protected]>
APickledWalrus
approved these changes
Dec 31, 2023
sovdeeth
added
2.9
1 task
I need to stop using the browser for merge conflicts
sovdeeth
added
the
feature-ready
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.
Description
Continuation of #5896.
Adds the ability to listen to events cancelled by other plugins by using
on all <event>,on any <event>, andon cancelled <event>.Previously, Skript would simply return before executing any triggers if the event was cancelled. Now it checks each trigger to see if each one is ignoring or listening to cancelled events based on the SkriptEvent's ListeningBehavior.
This should maintain current behavior without breaking changes.
Also fixes a bug with #5900 where event priority would leak from one event to following events.
Docs update:
Target Minecraft Versions: any
Requirements: none
Related Issues: #5891 #5908