diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java index 35c82fa3..52653986 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java @@ -168,25 +168,24 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA { double armourReduction = 0.0; + int f = 0; + int h = 0; + if (player.isPotionActive(AlchemicalWizardry.customPotionSoulFray)) { - int i = player.getActivePotionEffect(AlchemicalWizardry.customPotionSoulFray).getAmplifier() + 1; - - armourReduction = (i + 1) * 0.1; + f = player.getActivePotionEffect(AlchemicalWizardry.customPotionSoulFray).getAmplifier() + 1; } double damageAmount = 0.25; if (player.isPotionActive(AlchemicalWizardry.customPotionSoulHarden)) { - int i = player.getActivePotionEffect(AlchemicalWizardry.customPotionSoulHarden).getAmplifier() + 1; - damageAmount /= Math.max((1 - i * 0.1), 0.1); - } else - { - damageAmount *= 0.9; + h = player.getActivePotionEffect(AlchemicalWizardry.customPotionSoulHarden).getAmplifier() + 1; } + + armourReduction = 1 - 0.1 * Math.pow(1.0/3.0, Math.max(0, h - f)) - 0.1 * Math.max(0, f-h); - damageAmount *= (1.0 - armourReduction); + damageAmount *= (armourReduction); int maxAbsorption = 100000; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java index dd0e05e6..a6ce9b1f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java @@ -254,6 +254,7 @@ public class TEPedestal extends TileEntity implements IInventory public void onItemDeletion() { worldObj.addWeatherEffect(new EntityLightningBolt(worldObj, xCoord, yCoord, zCoord)); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); for (int i = 0; i < 16; i++) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java index 6e452642..9ec79ee4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java @@ -379,7 +379,7 @@ public class TEPlinth extends TileEntity implements IInventory } worldObj.createExplosion(entity, entity.posX, entity.posY, entity.posZ, 3, false); - deleteItemsInRing(1); + //deleteItemsInRing(1); isActive = false; progress = 0;