mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
23 lines
1.4 KiB
Diff
23 lines
1.4 KiB
Diff
|
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
|
||
|
|
index bad6a69246f6b0a4ada222b820f16469f91b0534..e0124e44e1abe8237859e8dc1e357298188dab52 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
@@ -2335,7 +2335,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||
|
|
this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
|
||
|
|
Entity entity = damagesource.getDirectEntity();
|
||
|
|
|
||
|
|
- if (entity instanceof LivingEntity && entity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper - Improve boat collision performance
|
||
|
|
+ if (!damagesource.is(DamageTypeTags.IS_PROJECTILE) && entity instanceof LivingEntity && entity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper - Improve boat collision performance
|
||
|
|
this.blockUsingShield((LivingEntity) entity);
|
||
|
|
}
|
||
|
|
}
|