Backport to 1.21.1: Fix custom bows being unusable by monsters extend…

…ing `AbstractSkeleton` (#1895) Co-authored-by: dhyces <[email protected]>
neoforged · Jan 23, 2025 · 0b5f50c · 0b5f50c
1 parent e4b879d
commit 0b5f50c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/patches/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch b/patches/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch
@@ -1,14 +1,16 @@
 --- a/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -157,7 +_,7 @@
+@@ -157,8 +_,8 @@
          if (this.level() != null && !this.level().isClientSide) {
              this.goalSelector.removeGoal(this.meleeGoal);
              this.goalSelector.removeGoal(this.bowGoal);
 -            ItemStack itemstack = this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW));
+-            if (itemstack.is(Items.BOW)) {
 +            ItemStack itemstack = this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, item -> item instanceof net.minecraft.world.item.BowItem));
-             if (itemstack.is(Items.BOW)) {
++            if (itemstack.getItem() instanceof net.minecraft.world.item.BowItem) {
                  int i = this.getHardAttackInterval();
                  if (this.level().getDifficulty() != Difficulty.HARD) {
+                     i = this.getAttackInterval();
 @@ -182,9 +_,11 @@
 
      @Override