From 8c6ba348c938a3de54c6e76d7497406831ac22da Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Sat, 22 Jun 2024 20:11:34 +0200 Subject: [PATCH] Fix wrong diff applying delta twice (#10959) --- patches/server/Add-entity-knockback-events.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/server/Add-entity-knockback-events.patch b/patches/server/Add-entity-knockback-events.patch index 80ca50a6b9..0e85944597 100644 --- a/patches/server/Add-entity-knockback-events.patch +++ b/patches/server/Add-entity-knockback-events.patch @@ -18,6 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } public void push(double deltaX, double deltaY, double deltaZ) { +- this.setDeltaMovement(this.getDeltaMovement().add(deltaX, deltaY, deltaZ)); + // Paper start - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent + this.push(deltaX, deltaY, deltaZ, null); + } @@ -33,9 +34,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + this.setDeltaMovement(this.getDeltaMovement().add(delta.getX(), delta.getY(), delta.getZ())); + // Paper end - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent - this.setDeltaMovement(this.getDeltaMovement().add(deltaX, deltaY, deltaZ)); this.hasImpulse = true; } + diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java