Skip to content

Prevent throwing ender peal if cooldown is 0.0 in the start of the match #533

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
Nandi0813 merged 8 commits into from
May 18, 2026
Merged

Prevent throwing ender peal if cooldown is 0.0 in the start of the match #533

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da1639f
fix: fix profile worldtime default value and handle offline players i…
lokspel May 18, 2026
8f035e8
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 18, 2026
6dcf467
fix: resolve party chat permission error caused by missing break
lokspel May 18, 2026
0490640
Merge remote-tracking branch 'origin/dev' into dev
lokspel May 18, 2026
8711fed
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 18, 2026
1fa95c3
fix: not-won round symbols rendering as filled on scoreboard
lokspel May 18, 2026
2ccbd30
Prevent throwing ender peal if cooldown is 0.0 in the start of the match
lokspel May 18, 2026
5c61583
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 18, 2026
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
8 changes: 4 additions & 4 deletions core/src/main/java/dev/nandi0813/practice/manager/fight/listener/EPCountdownListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ public void onProjectileShoot(ProjectileLaunchEvent e) {

Match match = MatchManager.getInstance().getLiveMatchByPlayer(player);
if (match != null) {
double duration = match.getLadder().getEnderPearlCooldown();
if (duration <= 0) {
if (!match.getCurrentRound().getRoundStatus().equals(RoundStatus.LIVE)) {
e.setCancelled(true);
return;
}

if (!match.getCurrentRound().getRoundStatus().equals(RoundStatus.LIVE)) {
e.setCancelled(true);
double duration = match.getLadder().getEnderPearlCooldown();
if (duration <= 0) {
return;
}

Expand Down