rallias/SpecialMobs
1
0
Fork 0
forked from mirrors/SpecialMobs
Code Pull requests Activity

Merge branch '1.16.5' of https://github.com/FatherToast/SpecialMobs into 1.16.5

Browse source
This commit is contained in:
Sarinsa 2022-10-12 00:13:12 +02:00
commit 715b0a78ab
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/fathertoast/specialmobs/common/entity/skeleton/_SpecialSkeletonEntity.java
View file

@ -140,8 +140,8 @@ public class _SpecialSkeletonEntity extends AbstractSkeletonEntity implements IS
/** @return The arrow for this skeleton to shoot. */ /** @return The arrow for this skeleton to shoot. */
@Override @Override
protected AbstractArrowEntity getArrow( ItemStack arrowItem, float damageMulti ) { protected AbstractArrowEntity getArrow( ItemStack arrowItem, float damageMulti ) {
return getVariantArrow( super.getArrow( arrowItem, damageMulti * getSpecialData().getRangedAttackDamage() ), return getVariantArrow( super.getArrow( arrowItem,
arrowItem, damageMulti ); damageMulti * getSpecialData().getRangedAttackDamage() / 2.0F ), arrowItem, damageMulti );
} }
/** Override to modify this entity's ranged attack projectile. */ /** Override to modify this entity's ranged attack projectile. */

4
src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/_SpecialWitherSkeletonEntity.java
View file

@ -139,8 +139,8 @@ public class _SpecialWitherSkeletonEntity extends WitherSkeletonEntity implement
/** @return The arrow for this skeleton to shoot. */ /** @return The arrow for this skeleton to shoot. */
@Override @Override
protected AbstractArrowEntity getArrow( ItemStack arrowItem, float damageMulti ) { protected AbstractArrowEntity getArrow( ItemStack arrowItem, float damageMulti ) {
return getVariantArrow( super.getArrow( arrowItem, damageMulti * getSpecialData().getRangedAttackDamage() ), return getVariantArrow( super.getArrow( arrowItem,
arrowItem, damageMulti ); damageMulti * getSpecialData().getRangedAttackDamage() / 2.0F ), arrowItem, damageMulti );
} }
/** Override to modify this entity's ranged attack projectile. */ /** Override to modify this entity's ranged attack projectile. */

2
src/main/java/fathertoast/specialmobs/common/entity/zombie/_SpecialZombieEntity.java
View file

@ -153,7 +153,7 @@ public class _SpecialZombieEntity extends ZombieEntity implements IRangedAttackM
/** @return The arrow for this zombie to shoot. */ /** @return The arrow for this zombie to shoot. */
protected AbstractArrowEntity getArrow( ItemStack arrowItem, float damageMulti ) { protected AbstractArrowEntity getArrow( ItemStack arrowItem, float damageMulti ) {
return getVariantArrow( ProjectileHelper.getMobArrow( this, arrowItem, return getVariantArrow( ProjectileHelper.getMobArrow( this, arrowItem,
damageMulti * getSpecialData().getRangedAttackDamage() ), arrowItem, damageMulti ); damageMulti * getSpecialData().getRangedAttackDamage() / 2.0F ), arrowItem, damageMulti );
} }
/** Override to modify this entity's ranged attack projectile. */ /** Override to modify this entity's ranged attack projectile. */

2
src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/_SpecialZombifiedPiglinEntity.java
View file

@ -150,7 +150,7 @@ public class _SpecialZombifiedPiglinEntity extends ZombifiedPiglinEntity impleme
/** @return The arrow for this zombie to shoot. */ /** @return The arrow for this zombie to shoot. */
protected AbstractArrowEntity getArrow( ItemStack arrowItem, float damageMulti ) { protected AbstractArrowEntity getArrow( ItemStack arrowItem, float damageMulti ) {
return getVariantArrow( ProjectileHelper.getMobArrow( this, arrowItem, return getVariantArrow( ProjectileHelper.getMobArrow( this, arrowItem,
damageMulti * getSpecialData().getRangedAttackDamage() ), arrowItem, damageMulti ); damageMulti * getSpecialData().getRangedAttackDamage() / 2.0F ), arrowItem, damageMulti );
} }
/** Override to modify this entity's ranged attack projectile. */ /** Override to modify this entity's ranged attack projectile. */