From 3acabf33fdadc45c870c34cea542f79924cf2acb Mon Sep 17 00:00:00 2001 From: Alexandra-Myers Date: Tue, 23 Apr 2024 16:53:44 -0400 Subject: [PATCH] Combatify 1.2.0 1.20.5 Beta 6 - Prevent server trying to load things it shouldn't --- src/main/java/net/atlas/combatify/mixin/LivingEntityMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/atlas/combatify/mixin/LivingEntityMixin.java b/src/main/java/net/atlas/combatify/mixin/LivingEntityMixin.java index dedbce3..81b8c42 100644 --- a/src/main/java/net/atlas/combatify/mixin/LivingEntityMixin.java +++ b/src/main/java/net/atlas/combatify/mixin/LivingEntityMixin.java @@ -166,7 +166,7 @@ public int changeIFrames(int original, @Local(ordinal = 0, argsOnly = true) fina int invulnerableTime = original - 10; if (entity2 instanceof Player player) { int base = (int) Math.min(player.getCurrentItemAttackStrengthDelay(), invulnerableTime); - invulnerableTime = base >= 4 ? base - 2 : base; + invulnerableTime = base >= 4 && !Combatify.CONFIG.canAttackEarly() ? base - 2 : base; if(player.getAttributeValue(Attributes.ATTACK_SPEED) - 1.5 >= 15 || Combatify.CONFIG.instaAttack()) invulnerableTime = original - 10; }