Cleanup some flag and match messages #1569
Open
+44
−35
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
calcastor
force-pushed
the
more-flag-message-stuff
branch
2 times, most recently
from
464bdf1 to
20c13d9
Compare
Pablete1234
requested changes
Dec 6, 2025
| if (!isFlag(carrier.getInventory().getHelmet())) { | ||
| this.dropFlag(); | ||
| if (isCurrent()) this.dropFlag(); | ||
| } |
Member
There was a problem hiding this comment.
i find it somewhat concerning that tickRunning as a whole is called if its not the current state, how is this happening?
Contributor
Author
There was a problem hiding this comment.
I'm not sure but this isn't the only place we guard dropFlag like this; we also do so in onEvent (InventoryClickEvent event) in Carried but with an additional guard of delegating it to a ScheduledExecutorService only for MatchPhase.RUNNING.
Looking at usages of tickRunning, it's called only if the match is running in BaseState and the rest of the usages are just supers in classes extending BaseState.
calcastor
force-pushed
the
more-flag-message-stuff
branch
from
ad623ad to
5f080f8
Compare
Signed-off-by: BT (calcastor/mame) <[email protected]>
Signed-off-by: BT (calcastor/mame) <[email protected]>
calcastor
force-pushed
the
more-flag-message-stuff
branch
from
5f080f8 to
c50494c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Carried; when we don't do this you can see that the flag is "dropped" twice in KotF: once when the match ends and then again after that, which is noticeable as duplicate messages.Respawningstate when the match is over.ChatManager.broadcastMessageand friends already do this.