Implement ItemMergeEvent, ExpBottleEvent, CreeperPowerEvent (#922) #925
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
aramperes
requested changes
May 27, 2018
| @@ -59,7 +63,15 @@ protected Sound getHurtSound() { | |||
| public void damage(double amount, Entity source, DamageCause cause) { | |||
| super.damage(amount, source, cause); | |||
| if (DamageCause.LIGHTNING.equals(cause)) { | |||
There was a problem hiding this comment.
Off-topic, but could you add a check for !isPowered() in this if statement?
| @@ -28,6 +31,8 @@ public void collide(LivingEntity entity) { | |||
|
|
|||
| private void spawnOrb() { | |||
| int xp = ThreadLocalRandom.current().nextInt(9) + 3; | |||
| ExpBottleEvent event = EventFactory.getInstance() | |||
| .callEvent(new ExpBottleEvent(this, xp)); | |||
There was a problem hiding this comment.
Set the xp variable to the result of event.getExperience()
There was a problem hiding this comment.
But xp has to be calculated before calling the new event
There was a problem hiding this comment.
I mean after the event is fired. The event object is mutable by plugins, which can use setExperience to change the behaviour.
So, after event is called, use xp = event.getExperience(); and keep the rest as is.
aramperes
approved these changes
May 27, 2018
|
Thank you for your contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.