mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
Fix LivingEntity#isBlocking to use ToolActions#SHIELD_BLOCK instead of UseAnim#BLOCK (#8933)
This commit is contained in:
1 parent
79112d6208
commit
7981093591
1 file changed
+9
@@ -590,6 +590,15 @@
|
||||
if (this.f_20935_.m_41781_()) {
|
||||
this.m_21329_();
|
||||
}
|
||||
@@ -2989,7 +_,7 @@
|
||||
public boolean m_21254_() {
|
||||
if (this.m_6117_() && !this.f_20935_.m_41619_()) {
|
||||
Item item = this.f_20935_.m_41720_();
|
||||
- if (item.m_6164_(this.f_20935_) != UseAnim.BLOCK) {
|
||||
+ if (item.m_6164_(this.f_20935_) != UseAnim.BLOCK && !this.f_20935_.canPerformAction(net.minecraftforge.common.ToolActions.SHIELD_BLOCK)) { // TODO 1.20 only use the tool action
|
||||
return false;
|
||||
} else {
|
||||
return item.m_8105_(this.f_20935_) - this.f_20936_ >= 5;
|
||||
@@ -3115,8 +_,8 @@
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user