patches/server/0983-Configurable-damage-tick-when-blocking-with-shield.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Bjarne Koll <lynxplay101@gmail.com>
Date: Thu, 13 Jun 2024 17:16:01 +0200
Subject: [PATCH] Configurable damage tick when blocking with shield


diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 0613ba9968968513549402f94e3b61dddd8c6beb..51c6f1e9f4b1c7eb7896c7f42c18cfd18a4f67da 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2411,7 +2411,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                         CriteriaTriggers.PLAYER_HURT_ENTITY.trigger((ServerPlayer) damagesource.getEntity(), this, damagesource, originalDamage, f, true); // Paper - fix taken/dealt param order
                     }
 
-                    return true;
+                    return !io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.skipVanillaDamageTickWhenShieldBlocked; // Paper - this should always return true, however expose an unsupported setting to flip this to false to enable "shield stunning".
                 } else {
                     return true; // Paper - return false ONLY if event was cancelled
                 }