Skip to content

Commit

Permalink
Cherry Picked "Fixed Neptunium Fillet Knife taking damage in some ins…
Browse files Browse the repository at this point in the history
…tances"
  • Loading branch information
GirafiStudios committed Aug 26, 2020
1 parent 95ad99a commit dc0d28e
Showing 1 changed file with 12 additions and 2 deletions.
@@ -1,9 +1,9 @@
package com.teammetallurgy.aquaculture.item;

import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.teammetallurgy.aquaculture.Aquaculture;
import com.teammetallurgy.aquaculture.api.AquacultureAPI;
import net.minecraft.block.BlockState;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.Enchantments;
Expand All @@ -14,8 +14,8 @@
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.SwordItem;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.world.World;
Expand Down Expand Up @@ -59,6 +59,16 @@ public Multimap<String, AttributeModifier> getAttributeModifiers(@Nonnull Equipm
return map;
}

@Override
public boolean hitEntity(@Nonnull ItemStack stack, @Nonnull LivingEntity target, @Nonnull LivingEntity attacker) {
return this.getTier() == AquacultureAPI.MATS.NEPTUNIUM || super.hitEntity(stack, target, attacker);
}

@Override
public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, @Nonnull BlockState state, @Nonnull BlockPos pos, @Nonnull LivingEntity entityLiving) {
return getTier() == AquacultureAPI.MATS.NEPTUNIUM || super.onBlockDestroyed(stack, world, state, pos, entityLiving);
}

@Override
@OnlyIn(Dist.CLIENT)
public void addInformation(@Nonnull ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag tooltipFlag) {
Expand Down

0 comments on commit dc0d28e

Please sign in to comment.