upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-11 15:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shields not working correctly. Fixes #9966

Browse Source
This commit is contained in:
LexManos committed 2024-05-06 18:56:20 -07:00
1 parent 968fa9eeb5
commit 0e28336fc0
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch
+1 -1
View File
@@ -586,7 +586,7 @@
Item item = this.useItem.getItem();
- return item.getUseAnimation(this.useItem) != UseAnim.BLOCK ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= 5;
+ boolean canBlock = this.useItem.canPerformAction(net.minecraftforge.common.ToolActions.SHIELD_BLOCK);
+ return canBlock ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= 5;
+ return !canBlock ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= 5;
} else {
return false;
}