Skip to content

Fixes Guardian/ElderGuardian API #968 #970

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

Merged
merged 7 commits into from
Nov 7, 2018

Conversation

j1o1h1n
Copy link
Contributor

@j1o1h1n j1o1h1n commented Oct 21, 2018

This picks up from #046673f by @Pr0methean to fix #968

  • code to handle setElder is all in GlowGuardian, and works for both classes
  • added ElderGuardianStore, using the single GuardianStore for both didn't work out well
  • removed call to setElder in Store.load
  • tests for setElder

@CLAassistant
Copy link

CLAassistant commented Oct 21, 2018

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@aramperes aramperes left a comment

Choose a reason for hiding this comment

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

Excellent work! Just one little change before merging.

@Override
public void save(GlowElderGuardian entity, CompoundTag compound) {
super.save(entity, compound);
compound.putBool("Elder", true);
Copy link
Member

Choose a reason for hiding this comment

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

The Elder tag has been removed from both guardian and elder_guardian stores, so it is no longer necessary to save it.

@aramperes
Copy link
Member

Hey @j1o1h1n, apologies for the delay. Could you merge this repo's dev branch back into your fork's guardian_968 branch? We've pushed a fix for the compilation errors.

@aramperes aramperes merged commit 262218f into GlowstoneMC:dev Nov 7, 2018
@aramperes
Copy link
Member

Thanks for your contribution!

@j1o1h1n j1o1h1n deleted the guardian_968 branch November 7, 2018 09:20
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.

Implementation of Guardian/ElderGuardian API
4 participants