mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

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

Browse source 
By: Brokkonaut <hannos17@gmx.de>
This commit is contained in:
CraftBukkit/Spigot 2021-08-28 19:02:19 +10:00
parent 08e5ad2b2f
commit 1dfe698f4f
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
View file

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