13
0
geforkt von Mirrors/Paper
Paper/patches/server/0946-Fix-shield-disable-inconsistency.patch

23 Zeilen
1.2 KiB
Diff

2024-04-27 04:09:42 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 26 Apr 2024 19:08:37 -0700
Subject: [PATCH] Fix shield disable inconsistency
In vanilla, if the damage source is tagged as a projectile,
it will not disable the shield if the attacker is holding
an axe item.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
2024-10-25 12:30:19 +02:00
index 7196340fefd95845f290329faef489f2b2626ecb..b33dd288065b665e6feb642d090de1fd6e725448 100644
2024-04-27 04:09:42 +02:00
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
2024-10-24 16:02:45 +02:00
@@ -2426,7 +2426,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
2024-04-27 04:09:42 +02:00
this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
Entity entity = damagesource.getDirectEntity();
2024-06-14 11:59:44 +02:00
- if (entity instanceof LivingEntity) {
+ if (!damagesource.is(DamageTypeTags.IS_PROJECTILE) && entity instanceof LivingEntity) { // Paper - Fix shield disable inconsistency
2024-04-27 04:09:42 +02:00
this.blockUsingShield((LivingEntity) entity);
}
}