Skip to content

Fix #1506: Boss respawns without cooldown after killing #1507

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

Draft
kangobot wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −13
Draft

Fix #1506: Boss respawns without cooldown after killing #1507

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
29 changes: 26 additions & 3 deletions src/main/java/org/mineacademy/boss/spawn/SpawnRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,20 @@ protected boolean checkLastExecuted() {
protected boolean canRun() {

// Respawn rules are ticked in a runnable task
if (this.checkLastExecuted())
if (this.lastExecuted != -1 && System.currentTimeMillis() - this.lastExecuted + 1 < this.delay.getTimeSeconds() * 1000) {
Debugger.debug("spawning", "[SpawnRule=" + this.getName() + "] Not running due to last executed " + (System.currentTimeMillis() - this.lastExecuted) / 1000 + "s ago and delay is " + this.delay.getTimeSeconds() + "s");
if (this.checkLastExecuted()) {
final long now = System.currentTimeMillis();
final long lastDeathTime = this.getLastDeathTime();

// Use whichever happened later: the last successful spawn or the last death of a boss spawned by this rule.
// This way "Delay" also acts as a cooldown after death, not just between spawn attempts.
final long effectiveLast = Math.max(this.lastExecuted, lastDeathTime);

if (effectiveLast > 0 && now - effectiveLast + 1 < this.delay.getTimeSeconds() * 1000) {
Debugger.debug("spawning", "[SpawnRule=" + this.getName() + "] Not running due to last spawn/death " + (now - effectiveLast) / 1000 + "s ago and delay is " + this.delay.getTimeSeconds() + "s");

return false;
}
}

if (!RandomUtil.chanceD(this.getChance())) {
Debugger.debug("spawning", "[SpawnRule=" + this.getName() + "] Not running due to chance did not pass: " + this.getChance() * 100 + "%");
Expand Down Expand Up @@ -341,6 +349,21 @@ public final void spawn(Location location, SpawnData data) {
this.lastExecuted = System.currentTimeMillis();
}

/**
* Returns the latest death timestamp of any boss that was spawned by this rule, or 0 if none.
*
* @return
*/
public long getLastDeathTime() {
long lastDeathTime = 0;

for (final Boss boss : Boss.getBosses())
if (this.getBosses().contains(boss.getName()))
lastDeathTime = Math.max(lastDeathTime, boss.getLastDeathFromSpawnRule(this));

return lastDeathTime;
}

/* ------------------------------------------------------------------------------- */
/* Menu system */
/* ------------------------------------------------------------------------------- */
Expand Down
10 changes: 0 additions & 10 deletions src/main/java/org/mineacademy/boss/spawn/SpawnRuleRespawn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,4 @@ protected boolean canRun(Boss boss, SpawnData data) {

return true;
}

public long getLastDeathTime() {
long lastDeathTime = 0;

for (final Boss boss : Boss.getBosses())
if (this.getBosses().contains(boss.getName()))
lastDeathTime = Math.max(lastDeathTime, boss.getLastDeathFromSpawnRule(this));

return lastDeathTime;
}
}