Boss abilities should no longer continue when bosses die due to untracked damage. Still waiting for Bukkit to add the missing damage handling.
This commit is contained in:
Binary file not shown.
@@ -1,7 +1,7 @@
|
|||||||
name: MobArena
|
name: MobArena
|
||||||
author: garbagemule
|
author: garbagemule
|
||||||
main: com.garbagemule.MobArena.MobArena
|
main: com.garbagemule.MobArena.MobArena
|
||||||
version: 0.94.4.63
|
version: 0.94.4.64
|
||||||
softdepend: [Spout,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells,Vault]
|
softdepend: [Spout,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells,Vault]
|
||||||
commands:
|
commands:
|
||||||
ma:
|
ma:
|
||||||
|
|||||||
@@ -388,9 +388,15 @@ public class ArenaListener
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MABoss boss = monsters.removeBoss(event.getEntity());
|
||||||
|
if (boss != null) {
|
||||||
|
boss.setDead(true);
|
||||||
|
}
|
||||||
|
|
||||||
if (!monsterExp)
|
if (!monsterExp) {
|
||||||
event.setDroppedExp(0);
|
event.setDroppedExp(0);
|
||||||
|
}
|
||||||
|
|
||||||
event.getDrops().clear();
|
event.getDrops().clear();
|
||||||
|
|
||||||
|
|||||||
@@ -94,4 +94,14 @@ public class MABoss
|
|||||||
public boolean isDead() {
|
public boolean isDead() {
|
||||||
return dead;
|
return dead;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the death status of a boss.
|
||||||
|
* This is used by the ArenaListener to force kill bosses that die due to
|
||||||
|
* unhandled damage events (Bukkit issues).
|
||||||
|
* @param dead death status
|
||||||
|
*/
|
||||||
|
public void setDead(boolean dead) {
|
||||||
|
this.dead = dead;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ public class WaveManager
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void reset() {
|
public void reset() {
|
||||||
|
reloadWaves();
|
||||||
wave = 0;
|
wave = 0;
|
||||||
singleWavesInstance = new TreeSet<Wave>(singleWaves);
|
singleWavesInstance = new TreeSet<Wave>(singleWaves);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user