From 1c6c7ba0a6aa29317d9c481352be26f523e70f70 Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Mon, 4 Apr 2016 19:24:43 -0400
Subject: [PATCH] Fixed some minor bugs with the Living Armour
---
.../WayofTime/bloodmagic/item/armour/ItemLivingArmour.java | 5 +++--
.../livingArmour/tracker/StatTrackerPhysicalProtect.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
index 6777b4d4..baf23bb2 100644
--- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
+++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
@@ -9,6 +9,7 @@ import WayofTime.bloodmagic.livingArmour.LivingArmour;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.util.helper.TextHelper;
+import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.client.renderer.ItemMeshDefinition;
@@ -248,14 +249,14 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack)
{
- if (this == ModItems.livingArmourChest && isEnabled(stack))
+ if (this == ModItems.livingArmourChest && isEnabled(stack) && slot == EntityEquipmentSlot.CHEST)
{
LivingArmour armour = ItemLivingArmour.getLivingArmour(stack);
return armour.getAttributeModifiers();
}
- return super.getAttributeModifiers(slot, stack);
+ return HashMultimap.<String, AttributeModifier>create();
}
@Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java
index cebff061..a99863f3 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java
@@ -18,7 +18,7 @@ public class StatTrackerPhysicalProtect extends StatTracker
public int totalDamage = 0;
public static HashMap<LivingArmour, Double> changeMap = new HashMap<LivingArmour, Double>();
- public static int[] damageRequired = new int[] { 30, 200, 400, 800, 1500, 2500, 3500, 5000, 6000 };
+ public static int[] damageRequired = new int[] { 30, 200, 400, 800, 1500, 2500, 3500, 5000, 7000, 15000 };
public static void incrementCounter(LivingArmour armour, double damage)
{