Skip to content

Fix cleanup ordering #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frolv merged 1 commit into from
Aug 4, 2026
Merged

Fix cleanup ordering #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/io/blert/challenges/colosseum/ColosseumChallenge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@ private void queueFinishColosseum(ChallengeState state) {
private void finishColosseum(ChallengeState state) {
log.debug("Ending Colosseum challenge: {}", state);
stateChangeCooldown = false;
int reported = reportedChallengeTicks;

cleanup();
dispatchEvent(new ChallengeEndEvent(reportedChallengeTicks, -1));

dispatchEvent(new ChallengeEndEvent(reported, -1));
setState(state);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/blert/challenges/inferno/InfernoChallenge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@ private void startInferno() {

private void finishInferno(ChallengeState state) {
log.info("Finishing Inferno challenge with state: {}", state);
int reported = reportedChallengeTicks;
cleanup();

dispatchEvent(new ChallengeEndEvent(reportedChallengeTicks, reportedChallengeTicks));
dispatchEvent(new ChallengeEndEvent(reported, reported));
setState(state);
}

Expand Down
6 changes: 4 additions & 2 deletions src/main/java/io/blert/challenges/mokhaiotl/MokhaiotlChallenge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,11 @@ private void startMokhaiotl() {

private void finishMokhaiotl() {
log.info("Finishing Mokhaiotl challenge with state: {}", getState());
cleanup();

dispatchEvent(new ChallengeEndEvent(reportedChallengeTicks, -1));
int reported = reportedChallengeTicks;

cleanup();
dispatchEvent(new ChallengeEndEvent(reported, -1));
setState(ChallengeState.INACTIVE);
}

Expand Down
Loading