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

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 b5994949028bc5cd30d893a1a6b296991d8d1570..9adaf1269e3eea6c0b62b5127317be7bfd651330 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
                 }
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`
			`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`
Add OMINOUS_ITEM_SPAWNER SpawnReason (#10897) 2024-07-15 23:35:51 +02:00			`index b5994949028bc5cd30d893a1a6b296991d8d1570..9adaf1269e3eea6c0b62b5127317be7bfd651330 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`
Properly apply damage tick after absorption (#11043) The logic in place to prevent players from processing a damage tick/knockback/etc when hit with 0 damage incorrectly used the damage events final damage value, which is reduced by absorption. Instead, use the event's "raw damage", e.g. the amount passed to hurt, in order to determine if the damage tick should be skipped. This still allows plugins to change the damage to a non-zero value and properly damage ticks the player in such a case, but correctly processes the damage tick in cases where the original damage is non zero but the actual damage is. 2024-07-08 21:20:18 +02:00			`@@ -2411,7 +2411,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`
			`}`