Fix #315

kettingpowered · Oct 5, 2024 · 583c362 · 583c362
1 parent b9074fb
commit 583c362
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch b/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch
@@ -1147,7 +1147,7 @@
 +
 +   //Ketting - this exists, so that the compiler doesn't try to optimize the else out. If it does, some mods have a mixin error.
 +   protected boolean actuallyHurt$override = true;
-+   private java.util.concurrent.atomic.AtomicBoolean actuallyHurt$return = new java.util.concurrent.atomic.AtomicBoolean(false);
++   protected java.util.concurrent.atomic.AtomicBoolean actuallyHurt$return = new java.util.concurrent.atomic.AtomicBoolean(false);
     protected void actuallyHurt(DamageSource p_21240_, float p_21241_) {
 +      if (actuallyHurt$override) {
 +         actuallyHurt$return.set(damageEntity0(p_21240_, p_21241_));

diff --git a/patches/minecraft/net/minecraft/world/entity/player/Player.java.patch b/patches/minecraft/net/minecraft/world/entity/player/Player.java.patch
@@ -335,7 +335,7 @@
 +   
     protected void actuallyHurt(DamageSource p_36312_, float p_36313_) {
 +      if (actuallyHurt$override) {
-+         damageEntity0(p_36312_, p_36313_);
++         actuallyHurt$return.set(damageEntity0(p_36312_, p_36313_));
 +         return;
 +      }
 +      else