Skip to content
Permalink
Browse files

patches from testing

  • Loading branch information...
mcmonkey4eva committed Jul 23, 2018
1 parent f9b1bd3 commit 40ff8206ca0bb000054332311fd7e57e9e3c242e
@@ -242,17 +242,17 @@
// == Begin Materials ==
if (v1_13) {
// Sword
addAllMaterials(SWORD_MATERIALS, "DIAMOND_SWORD", "IRON_SWORD", "STONE_SWORD", "GOLDEN_SWORD", "WOOD_SWORD");
addAllMaterials(SWORD_MATERIALS, "DIAMOND_SWORD", "IRON_SWORD", "STONE_SWORD", "GOLDEN_SWORD", "WOODEN_SWORD");
WEAPON_DAMAGE_MULTIPLIERS.put(getMaterial("DIAMOND_SWORD"), 7.0);
WEAPON_DAMAGE_MULTIPLIERS.put(getMaterial("IRON_SWORD"), 6.0);
WEAPON_DAMAGE_MULTIPLIERS.put(getMaterial("STONE_SWORD"), 5.0);
WEAPON_DAMAGE_MULTIPLIERS.put(getMaterial("GOLDEN_SWORD"), 4.0);
WEAPON_DAMAGE_MULTIPLIERS.put(getMaterial("WOOD_SWORD"), 4.0);
WEAPON_DAMAGE_MULTIPLIERS.put(getMaterial("WOODEN_SWORD"), 4.0);
// Pickaxe
addAllMaterials(PICKAXE_MATERIALS, "DIAMOND_PICKAXE", "IRON_PICKAXE", "STONE_PICKAXE", "GOLDEN_PICKAXE", "WOOD_PICKAXE");
addAllMaterials(PICKAXE_MATERIALS, "DIAMOND_PICKAXE", "IRON_PICKAXE", "STONE_PICKAXE", "GOLDEN_PICKAXE", "WOODEN_PICKAXE");
allMaterialsTo(WEAPON_DAMAGE_MULTIPLIERS, PICKAXE_MATERIALS, 2.0);
// Axe
addAllMaterials(AXE_MATERIALS, "DIAMOND_AXE", "IRON_AXE", "STONE_AXE", "GOLDEN_AXE", "WOOD_AXE");
addAllMaterials(AXE_MATERIALS, "DIAMOND_AXE", "IRON_AXE", "STONE_AXE", "GOLDEN_AXE", "WOODEN_AXE");
allMaterialsTo(WEAPON_DAMAGE_MULTIPLIERS, AXE_MATERIALS, 3.0);
// Bow
BOW_MATERIALS.add(getMaterial("BOW"));
@@ -701,22 +701,22 @@ public double getArmor(LivingEntity ent) {
// TODO: Enchantments!
double baseArmor = 0;
ItemStack helmet = ent.getEquipment().getHelmet();
Double helmetAdder = SentinelTarget.ARMOR_PROTECTION_MULTIPLIERS.get(helmet.getType());
Double helmetAdder = helmet == null ? null : SentinelTarget.ARMOR_PROTECTION_MULTIPLIERS.get(helmet.getType());
if (helmetAdder != null) {
baseArmor += helmetAdder;
}
ItemStack chestplate = ent.getEquipment().getChestplate();
Double chestplateAdder = SentinelTarget.ARMOR_PROTECTION_MULTIPLIERS.get(chestplate.getType());
Double chestplateAdder = chestplate == null ? null : SentinelTarget.ARMOR_PROTECTION_MULTIPLIERS.get(chestplate.getType());
if (chestplateAdder != null) {
baseArmor += chestplateAdder;
}
ItemStack leggings = ent.getEquipment().getLeggings();
Double leggingsAdder = SentinelTarget.ARMOR_PROTECTION_MULTIPLIERS.get(leggings.getType());
Double leggingsAdder = leggings == null ? null : SentinelTarget.ARMOR_PROTECTION_MULTIPLIERS.get(leggings.getType());
if (leggingsAdder != null) {
baseArmor += leggingsAdder;
}
ItemStack boots = ent.getEquipment().getBoots();
Double bootsAdder = SentinelTarget.ARMOR_PROTECTION_MULTIPLIERS.get(boots.getType());
Double bootsAdder = boots == null ? null : SentinelTarget.ARMOR_PROTECTION_MULTIPLIERS.get(boots.getType());
if (bootsAdder != null) {
baseArmor += bootsAdder;
}

0 comments on commit 40ff820

Please sign in to comment.
You can’t perform that action at this time.