From 9c1f21adc68bc626842322791692ccc262ecc008 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 17 Jun 2020 08:46:14 -0500 Subject: [PATCH] Update/doc vanilla crit logic in terrasteel helm to match vanilla --- .../equipment/armor/terrasteel/ItemTerrasteelHelm.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 0bad2099f..9659f1981 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; @@ -111,7 +112,11 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc if (attacker instanceof PlayerEntity) { PlayerEntity player = (PlayerEntity) attacker; if (hasArmorSet(player)) { - boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Effects.BLINDNESS) && !player.isPassenger(); + // [VanillaCopy] crit logic from PlayerEntity.attackTargetEntityWithCurrentItem + boolean strong = player.getCooledAttackStrength(0.5F) > 0.9F; + boolean crit = strong && player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Effects.BLINDNESS) && !player.isPassenger(); + crit = crit && !player.isSprinting(); + ItemStack stack = player.getItemStackFromSlot(EquipmentSlotType.HEAD); if (crit && !stack.isEmpty() && stack.getItem() instanceof ItemTerrasteelHelm) { if (hasAncientWill(stack, AncientWillType.AHRIM)) {