OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix shield disable inconsistency

Browse source 
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.
This commit is contained in:
Jake Potrebic 2024-04-26 19:08:37 -07:00
parent 3844905fa8
commit ba71d372a5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View file

@ -1216,7 +1216,7 @@
+ this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING)); + this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
+ Entity entity = damagesource.getDirectEntity(); + Entity entity = damagesource.getDirectEntity();
+ +
+ if (entity instanceof LivingEntity) { + if (!damagesource.is(DamageTypeTags.IS_PROJECTILE) && entity instanceof LivingEntity) { // Paper - Fix shield disable inconsistency
+ this.blockUsingShield((LivingEntity) entity); + this.blockUsingShield((LivingEntity) entity);
+ } + }
+ } + }