SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime"

This reverts commit 13b4e915a0. By: md_5 <git@md-5.net>
2024-03-20 20:31:48 +11:00
parent 13b4e915a0
commit 0223e7ff73
3 changed files with 48 additions and 52 deletions
--- a/paper-server/nms-patches/net/minecraft/world/entity/player/EntityHuman.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/player/EntityHuman.patch
@@ -235,7 +235,7 @@
 +    // CraftBukkit start
     @Override
 -    protected void actuallyHurt(DamageSource damagesource, float f) {
-+    protected float actuallyHurt(final DamageSource damagesource, float f) { // void -> float, returned value means the final damage
+    protected boolean actuallyHurt(DamageSource damagesource, float f) { // void -> boolean
 +        if (true) {
 +            return super.actuallyHurt(damagesource, f);
 +        }
@@ -256,7 +256,7 @@
                 this.gameEvent(GameEvent.ENTITY_DAMAGE);
             }
         }
-+        return 0; // CraftBukkit
+        return false; // CraftBukkit
     }
 
     @Override