Skip to content
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.

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

Boss bars for Wither & Ender Dragon #642

Merged
merged 13 commits into from Dec 28, 2017
Merged

Boss bars for Wither & Ender Dragon #642

merged 13 commits into from Dec 28, 2017

Conversation

Pr0methean
Copy link
Contributor

@Pr0methean Pr0methean commented Dec 23, 2017

Merge #641 first. Should this wait for after 2018.0.0?

if (hurtSound != null && !isSilent()) {
world.playSound(location, hurtSound, getSoundVolume(), getSoundPitch());
}
Sound hurtSound = health > 0 ? getHurtSound() : getDeathSound();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted.

public void setHealth(double health) {
super.setHealth(health);
if (health <= 0) {
bar.removeAll();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be moved to the remove() method instead. It is called when the entity dies, as well as if it is removed by other factors like despawning or plugins.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@mastercoms
Copy link
Member

I'm fine with merging this for this release because it isn't huge and doesn't have breaking changes.

@mastercoms mastercoms merged commit 736b3bd into GlowstoneMC:dev Dec 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants