diff --git a/patches/server/0003-Sakura-Configuration-Files.patch b/patches/server/0003-Sakura-Configuration-Files.patch index c365a0f..10a9e23 100644 --- a/patches/server/0003-Sakura-Configuration-Files.patch +++ b/patches/server/0003-Sakura-Configuration-Files.patch @@ -581,10 +581,10 @@ index 0000000000000000000000000000000000000000..f2bc1852dc5600015201bb462ed47a41 +} diff --git a/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java new file mode 100644 -index 0000000000000000000000000000000000000000..9577c9234e52c2b5a3ec62b24dbb4791fde02d64 +index 0000000000000000000000000000000000000000..7c579c28294452e107aa32eae3d07fde49087436 --- /dev/null +++ b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java -@@ -0,0 +1,235 @@ +@@ -0,0 +1,236 @@ +package me.samsuik.sakura.configuration; + +import com.mojang.logging.LogUtils; @@ -732,6 +732,7 @@ index 0000000000000000000000000000000000000000..9577c9234e52c2b5a3ec62b24dbb4791 + public boolean oldEnchantedGoldenApple = false; + public boolean oldSoundsAndParticleEffects = false; + public boolean fastHealthRegen = true; ++ public IntOr.Default maxArmourDamage = IntOr.Default.USE_DEFAULT; + } + + public Knockback knockback = new Knockback(); diff --git a/patches/server/0079-Add-max-armour-durability-damage.patch b/patches/server/0079-Add-max-armour-durability-damage.patch new file mode 100644 index 0000000..c4c07a3 --- /dev/null +++ b/patches/server/0079-Add-max-armour-durability-damage.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samsuik +Date: Wed, 2 Oct 2024 18:45:22 +0100 +Subject: [PATCH] Add max armour durability damage + + +diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java +index 4562a9c7327c6981e36cbeda88b53b44f1bbf20b..222558ec09ed64574fcbcbd40537981cd2e6403d 100644 +--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java ++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +@@ -2437,6 +2437,12 @@ public abstract class LivingEntity extends Entity implements Attackable { + // Apply damage to armor + if (!damagesource.is(DamageTypeTags.BYPASSES_ARMOR)) { + float armorDamage = (float) (event.getDamage() + event.getDamage(DamageModifier.BLOCKING) + event.getDamage(DamageModifier.HARD_HAT)); ++ // Sakura start - add max armour durability damage ++ int maxArmourDamage = this.level().sakuraConfig().players.combat.maxArmourDamage.or(-1); ++ if (maxArmourDamage >= 0) { ++ armorDamage = Math.min(armorDamage, maxArmourDamage); ++ } ++ // Sakura end - add max armour durability damage + this.hurtArmor(damagesource, armorDamage); + } +