|
|
|
@ -145,6 +145,7 @@ public class CustomDamage { |
|
|
|
|
if (headshotdmg!=0.0) {headshot=true;} |
|
|
|
|
dmg += headshotdmg; |
|
|
|
|
dmg += addMultiplierToPlayerLogger(damager,target,"Bow Drawback Mult",dmg * calculateBowDrawbackMultiplier(weapon,damager,target)); |
|
|
|
|
dmg += addMultiplierToPlayerLogger(damager,target,"Custom Arrow Mult",dmg * calculateCustomArrowMultiplier(weapon,damager,target)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
@ -188,6 +189,20 @@ public class CustomDamage { |
|
|
|
|
return dmg; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static double calculateCustomArrowMultiplier(ItemStack weapon, Entity damager, LivingEntity target) { |
|
|
|
|
double mult = 0.0; |
|
|
|
|
if (damager instanceof TippedArrow) { |
|
|
|
|
TippedArrow a = (TippedArrow)damager; |
|
|
|
|
if (a.hasMetadata("QUADRUPLE_DAMAGE_ARR")) { |
|
|
|
|
mult += 4.0; |
|
|
|
|
} |
|
|
|
|
if (a.hasMetadata("DOUBLE_DAMAGE_ARR")) { |
|
|
|
|
mult+=2.0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return mult; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static void addToPlayerRawDamage(double damage, LivingEntity target) { |
|
|
|
|
if (target instanceof Player) { |
|
|
|
|
Player p = (Player)target; |
|
|
|
|