From 94c5699a03e80cc7ebfac91e3e0f8208b47eef39 Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Wed, 15 Mar 2023 18:42:02 +0000
Subject: [PATCH] Remove our fix for MC-121048 as it has been fixed by Vanilla
 (#9381)

---
 .../net/minecraft/world/entity/LivingEntity.java.patch     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch b/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch
index 68495b84ef..dc8a4e3d54 100644
--- a/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch
+++ b/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch
@@ -371,7 +371,7 @@
           p_21241_ = this.m_21161_(p_21240_, p_21241_);
           p_21241_ = this.m_6515_(p_21240_, p_21241_);
           float f1 = Math.max(p_21241_ - this.m_6103_(), 0.0F);
-@@ -1560,14 +_,16 @@
+@@ -1560,10 +_,11 @@
              Entity entity = p_21240_.m_7639_();
              if (entity instanceof ServerPlayer) {
                 ServerPlayer serverplayer = (ServerPlayer)entity;
@@ -384,11 +384,6 @@
           if (f1 != 0.0F) {
              float f2 = this.m_21223_();
              this.m_21231_().m_19289_(p_21240_, f2, f1);
-             this.m_21153_(f2 - f1);
-+            this.m_21153_(f1 - f2); // Forge: moved to fix MC-121048
-             this.m_7911_(this.m_6103_() - f1);
-             this.m_146850_(GameEvent.f_223706_);
-          }
 @@ -1622,6 +_,8 @@
     }