mirror of
https://github.com/GTNewHorizons/ThaumicTinkerer.git
synced 2026-10-25 20:32:29 +00:00
Fixed Talisman breaking - #805
This commit is contained in:
1 parent
981397cf3c
commit
81d9fe3d97
3 files changed
+9
-1
No files matched your search
@@ -81,7 +81,7 @@ public class TinkersConstructCompat {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
private static int calculateIncrease(ItemStack tool, int amount) {
|
||||
NBTTagCompound tags = tool.getTagCompound().getCompoundTag(TAG_INFINITOOL);
|
||||
int increase = amount * 2;
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
package thaumic.tinkerer.common.item;
|
||||
|
||||
import baubles.api.BaubleType;
|
||||
import baubles.api.BaublesApi;
|
||||
import baubles.api.IBauble;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -30,6 +31,8 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
@@ -169,6 +172,10 @@ public class ItemCleansingTalisman extends ItemBase implements IBauble {
|
||||
|
||||
|
||||
par1ItemStack.damageItem(damage, player);
|
||||
if(par1ItemStack.getItemDamage()<=0)
|
||||
{
|
||||
BaublesApi.getBaubles((EntityPlayer) player).setInventorySlotContents(BaubleType.AMULET.ordinal(),null);
|
||||
}
|
||||
par2World.playSoundAtEntity(player, "thaumcraft:wand", 0.3F, 0.1F);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,4 +173,5 @@ public class ItemInfusedPotion extends ItemPotion implements ITTinkererItem {
|
||||
this.aspect = a;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user