Siege Improvements #30
Merged
Conversation
This file contains hidden or 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
TylerS1066
requested changes
Mar 17, 2024
src/main/java/net/countercraft/movecraft/warfare/features/siege/SiegeLeaderListener.java
Outdated
Show resolved
Hide resolved
src/main/java/net/countercraft/movecraft/warfare/features/siege/SiegeLeaderListener.java
Outdated
Show resolved
Hide resolved
src/main/java/net/countercraft/movecraft/warfare/features/siege/SiegeLeaderListener.java
Outdated
Show resolved
Hide resolved
| Bukkit.getServer().broadcastMessage(String.format(I18nSupport.getInternationalisedString("Siege - Sudden Death"), | ||
| siege.getName(), (timeLeft+2)/60)); | ||
| if (!siege.leaderIsInControl()) { | ||
| endSiege(); |
Contributor
There was a problem hiding this comment.
Won't this cause the siege to end twice since it's also ended in SiegeLeaderListener?
Contributor
Author
There was a problem hiding this comment.
No, because the SiegeLeaderListener one specifically fires when a craft is sunk or released, whereas the SiegeProgressTask one fires when sudden death begins and there is no flagship detected.
Contributor
|
We also need to resolve the merge conflicts |
whoops
added priorities to all events, set them to ignore cancelled
TylerS1066
approved these changes
May 26, 2024
TylerS1066
approved these changes
May 26, 2024
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.
This PR makes a few changes to the siege system to help automatically enforce certain rules, such as siege leaders not being allowed to leave the box and siege sudden death.
It also makes some minor changes to the siege announcements to provide players with more information and fixes some grammatical errors that were really bugging me.
This will close #24