From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Fri, 23 Feb 2024 02:07:03 +0000 Subject: [PATCH] Change shields to reduce damage diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index 532fef2f50a0904a7c64bac30aa61dc71fcfc7dd..0adf993b1b03b4e68d83e67872c0f592c2d7c91f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2279,7 +2279,13 @@ public abstract class LivingEntity extends Entity implements Attackable { Function blocking = new Function() { @Override public Double apply(Double f) { + // Sakura start - shield damage reduction + if (!level().sakuraConfig().players.combat.shieldDamageReduction || damagesource.getDirectEntity() instanceof AbstractArrow) { return -((LivingEntity.this.isDamageSourceBlocked(damagesource)) ? f : 0.0); + } else { + return -(LivingEntity.this.isBlocking() ? f * 0.5 : 0.0); + } + // Sakura end - shield damage reduction } }; float blockingModifier = blocking.apply((double) f).floatValue();