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

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Bjarne Koll <git@lynxplay.dev>
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 be8db026f1a84ddc9c43be3c4aa84b09581c5401..587645818563e277157637723e4d8c21f8cd712d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2498,7 +2498,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
                 }
Configurable damage tick when blocking with shield (#10877) A long standing bug in spigot and its derivatives was the fact that players taking damage while blocking with a shield would not receive invulnerability, while they do in vanilla. This enabled the pvp technique of disabling a shield and immediately attacking again to knock a player into the air. While upstream fixed this and properly aligned itself with vanilla damage logic (in this specific case) changing such long standing behaviour has some downsides. To allow players used to this specific bug to still use it, this patch introduces a configuration option to re-introduce said bug. As there is no easy way to only re-add this bug, the option is found in the unsupported section as it may introduce other damage related disparity from vanilla. 2024-06-15 23:09:34 +02:00			`From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
Fix incorrect invulnerability damage reduction (#11599) Fixes incorrect spigot handling of the invulnerability damage reduction applied when an already invulnerable entity is damaged with a larger damage amount than the initial damage. Vanilla still damages entities even if invulnerable if the damage to be applied is larger than the previous damage taken. In that case, vanilla applies the difference between the previous damage taken and the proposed damage. Spigot's damage modifier API takes over the computation of damage reducing effects, however spigot invokes this handling with the initial damage before computing the difference to the previous damage amount. This leads to the reduction values to generally be larger than expected, as they are computed on the not-yet-reduced value. Spigot applies these reductions after calling the EntityDamageEvent and then subtracts the previous damage point, leading to the final damage amount being smaller than expected. This patch cannot simply call the EntityDamageEvent with the reduced damage, as that would lead to EntityDamageEvent#getDamage() returning the already reduced damage, which breaks its method contract. Instead, this patch makes use of the DamageModifier API, implementing the last-damage-reduction as a DamageModifier. 2024-11-19 11:54:58 +01:00			`From: Bjarne Koll <git@lynxplay.dev>`
Configurable damage tick when blocking with shield (#10877) A long standing bug in spigot and its derivatives was the fact that players taking damage while blocking with a shield would not receive invulnerability, while they do in vanilla. This enabled the pvp technique of disabling a shield and immediately attacking again to knock a player into the air. While upstream fixed this and properly aligned itself with vanilla damage logic (in this specific case) changing such long standing behaviour has some downsides. To allow players used to this specific bug to still use it, this patch introduces a configuration option to re-introduce said bug. As there is no easy way to only re-add this bug, the option is found in the unsupported section as it may introduce other damage related disparity from vanilla. 2024-06-15 23:09:34 +02:00			`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`
More more more more work 2024-12-03 20:34:55 +01:00			`index be8db026f1a84ddc9c43be3c4aa84b09581c5401..587645818563e277157637723e4d8c21f8cd712d 100644`
Configurable damage tick when blocking with shield (#10877) A long standing bug in spigot and its derivatives was the fact that players taking damage while blocking with a shield would not receive invulnerability, while they do in vanilla. This enabled the pvp technique of disabling a shield and immediately attacking again to knock a player into the air. While upstream fixed this and properly aligned itself with vanilla damage logic (in this specific case) changing such long standing behaviour has some downsides. To allow players used to this specific bug to still use it, this patch introduces a configuration option to re-introduce said bug. As there is no easy way to only re-add this bug, the option is found in the unsupported section as it may introduce other damage related disparity from vanilla. 2024-06-15 23:09:34 +02:00			`--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java`
			`+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java`
More more more more work 2024-12-03 20:34:55 +01:00			`@@ -2498,7 +2498,7 @@ public abstract class LivingEntity extends Entity implements Attackable {`
Configurable damage tick when blocking with shield (#10877) A long standing bug in spigot and its derivatives was the fact that players taking damage while blocking with a shield would not receive invulnerability, while they do in vanilla. This enabled the pvp technique of disabling a shield and immediately attacking again to knock a player into the air. While upstream fixed this and properly aligned itself with vanilla damage logic (in this specific case) changing such long standing behaviour has some downsides. To allow players used to this specific bug to still use it, this patch introduces a configuration option to re-introduce said bug. As there is no easy way to only re-add this bug, the option is found in the unsupported section as it may introduce other damage related disparity from vanilla. 2024-06-15 23:09:34 +02:00			`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`
			`}`