Spartan Weaponry

Spartan Weaponry

Mods
48M Downloads

Potential issues with canApplyAtEnchantingTable check

KreloX opened this issue ยท 1 comments

commented

SpartanWeaponry/src/main/java/com/oblivioussp/spartanweaponry/item/SwordBaseItem.java

Lines 359 to 370 in 9eff63a

public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment)
{
for(WeaponTrait trait : traits)
{
if(trait.isEnchantmentCompatible(enchantment))
return true;
else if(trait.isEnchantmentIncompatible(enchantment))
return false;
}
// Sweeping Edge is incompatible with most weapons unless they have the Sweep I trait
return enchantment != Enchantments.SWEEPING_EDGE && super.canApplyAtEnchantingTable(stack, enchantment);
}

This check should not pass when any of the traits mark the enchantment as incompatible, because incompatibility should probably take priority.
Currently the priority goes to the first iterated over trait with changes to enchantment compatibility.
It should pass if: none specify incompatible && (at least one specifies compatible || isnt sweeping edge && super call)

commented 
    public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment)
    {
        boolean isCompatible = false;
        for(WeaponTrait trait : traits)
        {
            if(trait.isEnchantmentIncompatible(enchantment))
                return false;
            else if(trait.isEnchantmentCompatible(enchantment))
                isCompatible = true;
        }
        // Sweeping Edge is incompatible with most weapons unless they have the Sweep I trait
        return isCompatible || enchantment != Enchantments.SWEEPING_EDGE && super.canApplyAtEnchantingTable(stack, enchantment);
    }