Skip to content

Commit c90fed2

Browse files
Should Fix Special Armor mixin
1 parent aba99a5 commit c90fed2

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/main/java/gregtech/mixins/forge/SpecialArmorPropertiesMixin.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import net.minecraftforge.common.ISpecialArmor;
1010

1111
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
12-
import com.llamalad7.mixinextras.sugar.Local;
1312
import org.spongepowered.asm.mixin.Mixin;
1413
import org.spongepowered.asm.mixin.injection.At;
1514

@@ -18,13 +17,12 @@
1817
public class SpecialArmorPropertiesMixin {
1918

2019
@ModifyExpressionValue(method = "applyArmor",
21-
at = @At(value = "INVOKE_ASSIGN",
20+
at = @At(value = "INVOKE",
2221
target = "Lnet/minecraft/util/CombatRules;getDamageAfterAbsorb(FFF)F"),
2322
remap = false)
24-
private static double adjustArmorAbsorption(double originalDamage, float damage, float totalArmor,
25-
float totalToughness, @Local EntityLivingBase entity,
26-
@Local NonNullList<ItemStack> inventory,
27-
@Local DamageSource damageSource) {
23+
private static float adjustArmorAbsorption(float originalDamage, EntityLivingBase entity,
24+
NonNullList<ItemStack> inventory,
25+
DamageSource damageSource, double damage) {
2826
double armorDamage = Math.max(1.0F, damage / 4.0F);
2927
for (int i = 0; i < inventory.size(); i++) {
3028
ItemStack itemStack = inventory.get(i);

0 commit comments

Comments
 (0)