Add OMINOUS_ITEM_SPAWNER SpawnReason (#10897)

1 files changed, 19 insertions, 0 deletions

diff --git a/patches/server/0988-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0988-Configurable-damage-tick-when-blocking-with-shield.patch
new file mode 100644
index 0000000000..5854c4306d
--- /dev/null
+++ b/patches/server/0988-Configurable-damage-tick-when-blocking-with-shield.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bjarne Koll <[email protected]>
+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
+                 }