Fix critical hit damage on vanilla

SpongePowered · Oct 12, 2023 · 29b92a5 · 29b92a5
1 parent 4053462
commit 29b92a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/forge/src/main/java/org/spongepowered/forge/hook/ForgeEventHooks.java b/forge/src/main/java/org/spongepowered/forge/hook/ForgeEventHooks.java
@@ -66,7 +66,7 @@ public void callItemDestroyedEvent(
     public CriticalHitResult callCriticalHitEvent(
         final Player player, final Entity targetEntity, final boolean isCriticalAttack, final float v
     ) {
-        final CriticalHitEvent hitResult = ForgeHooks.getCriticalHit(player, targetEntity, isCriticalAttack, v);
+        final CriticalHitEvent hitResult = ForgeHooks.getCriticalHit(player, targetEntity, isCriticalAttack, v + 1.0F);
         if (hitResult != null) {
             return new CriticalHitResult(true, hitResult.getDamageModifier() - 1.0F);
         }

diff --git a/...java/org/spongepowered/common/mixin/core/world/entity/player/PlayerMixin_Attack_Impl.java b/...java/org/spongepowered/common/mixin/core/world/entity/player/PlayerMixin_Attack_Impl.java
@@ -191,7 +191,7 @@ public void attack(final Entity targetEntity) {
                     isCriticalAttack = isStrongAttack && this.fallDistance > 0.0F && !this.onGround && !this.shadow$onClimbable() && !this.shadow$isInWater() && !this.shadow$hasEffect(
                         MobEffects.BLINDNESS) && !this.shadow$isPassenger() && targetEntity instanceof LivingEntity;
                     isCriticalAttack = isCriticalAttack && !this.shadow$isSprinting();
-                    final EventHooks.CriticalHitResult criticalResult = PlatformHooks.INSTANCE.getEventHooks().callCriticalHitEvent((net.minecraft.world.entity.player.Player) (Object) this, targetEntity, isCriticalAttack, isCriticalAttack ? 1.5F : 1.0F);
+                    final EventHooks.CriticalHitResult criticalResult = PlatformHooks.INSTANCE.getEventHooks().callCriticalHitEvent((net.minecraft.world.entity.player.Player) (Object) this, targetEntity, isCriticalAttack, isCriticalAttack ? 0.5F : 0.0F);
                     isCriticalAttack = criticalResult.criticalHit;
                     if (isCriticalAttack) {
                         // Sponge Start - add critical attack tuple