SPIGOT-6726: NPE when calling getBossBar() on plugin spawned EnderDragon

By: Brokkonaut <hannos17@gmx.de>
This commit is contained in:
CraftBukkit/Spigot 2021-08-28 19:02:19 +10:00
parent 08e5ad2b2f
commit 1dfe698f4f

View file

@ -67,12 +67,13 @@ public class CraftEnderDragon extends CraftComplexLivingEntity implements EnderD
@Override
public BossBar getBossBar() {
return getDragonBattle().getBossBar();
DragonBattle battle = getDragonBattle();
return battle != null ? battle.getBossBar() : null;
}
@Override
public DragonBattle getDragonBattle() {
return new CraftDragonBattle(getHandle().getEnderDragonBattle());
return getHandle().getEnderDragonBattle() != null ? new CraftDragonBattle(getHandle().getEnderDragonBattle()) : null;
}
@Override