From 95b1aa991b99e675e0ad73d9cb8302b8205f1f99 Mon Sep 17 00:00:00 2001 From: patience Date: Tue, 10 Mar 2026 02:04:45 +0000 Subject: [PATCH] Capped* strength of Collapse --- .../patience/mc_rebalance/enchant_effects/CollapseEffect.java | 2 +- src/main/resources/data/mc_rebalance/enchantment/collapse.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/CollapseEffect.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/CollapseEffect.java index 141309a..ec06078 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/CollapseEffect.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/CollapseEffect.java @@ -47,7 +47,7 @@ public record CollapseEffect(LevelBasedValue amount) implements EnchantmentEntit // as well as punishing loading too many effects at once due to their local iframes. // AKA: this minimises the odds that players start 1-tapping each other. float damage = (effect.getAmplifier() + 1) * effect.getDuration() + 0.05f; - enemy.hurt(enemy.damageSources().magic(), Math.max(damage, this.amount.calculate(level))); + enemy.hurt(enemy.damageSources().magic(), Math.min(damage, this.amount.calculate(level))); enemy.invulnerableTime = 0; } } diff --git a/src/main/resources/data/mc_rebalance/enchantment/collapse.json b/src/main/resources/data/mc_rebalance/enchantment/collapse.json index c8c6830..cb89bc2 100644 --- a/src/main/resources/data/mc_rebalance/enchantment/collapse.json +++ b/src/main/resources/data/mc_rebalance/enchantment/collapse.json @@ -26,7 +26,7 @@ "enchanted": "attacker", "effect": { "type": "mc_rebalance:collapse", - "amount": 1.0 + "amount": 20.0 } } ]