Fix duplicate EntityKnockbackEvent for sprint attacks and add ENTITY_SPRINT_ATTACK cause #14156
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -597,7 +597,7 @@ | |
| if (success) { | ||
| this.lastDamageSource = source; | ||
| this.lastDamageStamp = this.level().getGameTime(); | ||
| @@ -1300,13 +_,36 @@ | ||
| zd = source.getSourcePosition().z() - this.getZ(); | ||
| } | ||
|
|
||
|
|
@@ -611,7 +611,15 @@ | |
| + } | ||
| + // Paper end - Check distance in entity interactions | ||
| + | ||
| + io.papermc.paper.event.entity.EntityKnockbackEvent.Cause cause; | ||
| + if (source.getDirectEntity() instanceof LivingEntity living && living.isSprinting()) { | ||
| + cause = io.papermc.paper.event.entity.EntityKnockbackEvent.Cause.ENTITY_SPRINT_ATTACK; | ||
| + } else if (source.getDirectEntity() == null) { | ||
| + cause = io.papermc.paper.event.entity.EntityKnockbackEvent.Cause.DAMAGE; | ||
| + } else { | ||
| + cause = io.papermc.paper.event.entity.EntityKnockbackEvent.Cause.ENTITY_ATTACK; | ||
| + } | ||
| + this.knockback(0.4F, xd, zd, source, damage, source.getDirectEntity(), cause); // CraftBukkit // Paper - knockback events | ||
| if (!blocked) { | ||
| this.indicateDamage(xd, zd); | ||
| } | ||
|
|
@@ -902,7 +910,7 @@ | |
| Vec3 deltaMovement = this.getDeltaMovement(); | ||
|
|
||
| while (xd * xd + zd * zd < 1.0E-5F) { | ||
| @@ -1651,16 +_,34 @@ | ||
| } | ||
|
|
||
| Vec3 deltaVector = new Vec3(xd, 0.0, zd).normalize().scale(power); | ||
|
|
@@ -914,13 +922,15 @@ | |
| ); | ||
| + // Paper start - knockback events | ||
| + Vec3 knockback = targetMovement.subtract(deltaMovement); | ||
| + if (!comesFromEffect) { | ||
|
Member
There was a problem hiding this comment. Tis boolean looks somewhat concerning, what does this signify? This looks like double firing is actually intended as in many cases this is additional knockback over the entity?
Author
There was a problem hiding this comment. That boolean distinguishes the base attack knockback from the extra knockback added by attributes/enchantments. The double movement application (base + extra) is vanilla behavior, but firing the Paper event twice for a single hit isn't desirable — that's what caused #11622 (event firing twice on sprint attacks). This boolean lets the event fire only once (on the base call), while both movement increments still get applied. |
||
| + io.papermc.paper.event.entity.EntityKnockbackEvent event = CraftEventFactory.callEntityKnockbackEvent((org.bukkit.craftbukkit.entity.CraftLivingEntity) this.getBukkitEntity(), attacker, attacker, eventCause, power, knockback); | ||
| + if (event.isCancelled()) { | ||
| + return; | ||
| + } | ||
| + | ||
| + this.needsSync = true; | ||
| + } | ||
| + this.setDeltaMovement(deltaMovement.add(knockback.x, knockback.y, knockback.z)); | ||
| + // Paper end - knockback events | ||
| } | ||
| } | ||
|
|
@@ -1271,15 +1281,26 @@ | |
| } | ||
|
|
||
| private Vec3 updateFallFlyingMovement(Vec3 movement) { | ||
| @@ -2748,9 +_,16 @@ | ||
| final Entity target, final float knockback, final Vec3 oldMovement, final DamageSource damageSource, final float damage, final boolean comesFromEffect | ||
| ) { | ||
| if (knockback > 0.0F && target instanceof LivingEntity livingTarget) { | ||
| - livingTarget.knockback( | ||
| - knockback, Mth.sin(this.getYRot() * Mth.DEG_TO_RAD), -Mth.cos(this.getYRot() * Mth.DEG_TO_RAD), damageSource, damage, comesFromEffect | ||
| - ); | ||
|
|
||
| + if (this.isSprinting()) { | ||
| + livingTarget.knockback( | ||
| + knockback, Mth.sin(this.getYRot() * Mth.DEG_TO_RAD), -Mth.cos(this.getYRot() * Mth.DEG_TO_RAD), damageSource, damage, comesFromEffect, this, io.papermc.paper.event.entity.EntityKnockbackEvent.Cause.ENTITY_SPRINT_ATTACK // Paper - knockback events | ||
| + ); | ||
| + } | ||
| + else { | ||
| + livingTarget.knockback( | ||
| + knockback, Mth.sin(this.getYRot() * Mth.DEG_TO_RAD), -Mth.cos(this.getYRot() * Mth.DEG_TO_RAD), damageSource, damage, comesFromEffect, this, io.papermc.paper.event.entity.EntityKnockbackEvent.Cause.ENTITY_ATTACK // Paper - knockback events | ||
| + ); | ||
| + } | ||
| this.setDeltaMovement(this.getDeltaMovement().multiply(0.6, 1.0, 0.6)); | ||
| } | ||
| } | ||
| @@ -2826,37 +_,15 @@ | ||
| profiler.pop(); | ||
| profiler.push("rangeChecks"); | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See the contrib guide; it needs start/end comments. You can't just add a block of code and then only comment a singular line in there