From c918a1b6d8008773e9beebb48ba1a770405aee20 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 19:54:41 -0400 Subject: Bulk update back to sanity --- .../blessings/standard/AlchemistBlessing.java | 2 +- .../blessings/standard/BerserkerBlessing.java | 21 ++++++-------------- .../blessings/standard/GuardianBlessing.java | 5 ++--- .../blessings/standard/HunterBlessing.java | 6 ++---- .../blessings/standard/InfernoBlessing.java | 22 +++++++++------------ .../blessings/standard/LonerBlessing.java | 10 +++------- .../blessings/standard/LooterBlessing.java | 7 ++----- .../blessings/standard/LumberjackBlessing.java | 10 +++------- .../blessings/standard/MechanicBlessing.java | 2 +- .../blessings/standard/MinerBlessing.java | 13 ++++-------- .../blessings/standard/NinjaBlessing.java | 23 +++++++--------------- .../blessings/standard/PaladinBlessing.java | 3 +-- .../blessings/standard/ParatrooperBlessing.java | 11 +++++------ .../blessings/standard/PorcupineBlessing.java | 17 +++++----------- .../blessings/standard/ScholarBlessing.java | 8 +++----- .../blessings/standard/SwampBlessing.java | 10 +++------- .../blessings/standard/ThickSkinnedBlessing.java | 4 ++-- .../blessings/standard/ThiefBlessing.java | 5 ++--- .../blessings/standard/VampireBlessing.java | 7 ++----- .../blessings/standard/WarriorBlessing.java | 10 +++------- 20 files changed, 66 insertions(+), 130 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/blessings/standard') diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/AlchemistBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/AlchemistBlessing.java index aed4e0e..e78fa1b 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/AlchemistBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/AlchemistBlessing.java @@ -6,7 +6,7 @@ public class AlchemistBlessing extends StandardBlessing { public AlchemistBlessing() { super("Alchemist", false); } - + @Override public String name() { return "Alchemist"; diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/BerserkerBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/BerserkerBlessing.java index fc11ebf..0fa022f 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/BerserkerBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/BerserkerBlessing.java @@ -17,10 +17,8 @@ public class BerserkerBlessing extends StandardBlessing { } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { - if (BlessingUtils.isBlessingActive( - event.source.getEntity())) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { + if (BlessingUtils.isBlessingActive(event.source.getEntity())) { return damageMultiplier + 0.3f; } @@ -29,18 +27,11 @@ public class BerserkerBlessing extends StandardBlessing { @Override public void onMobKill(LivingDeathEvent event) { - if (!EntityStatHelper.hasStat(event.source.getEntity(), - "BlessingCounter")) { - EntityStatHelper.giveStat(event.source.getEntity(), - "BlessingCounter", 0); + if (!EntityStatHelper.hasStat(event.source.getEntity(), "BlessingCounter")) { + EntityStatHelper.giveStat(event.source.getEntity(), "BlessingCounter", 0); } - EntityStatHelper.giveStat(event.source.getEntity(), - "BlessingCounter", - Math.min(10, Integer.parseInt( - EntityStatHelper.getStat( - event.source.getEntity(), - "BlessingCounter")) - + 1)); + EntityStatHelper.giveStat(event.source.getEntity(), "BlessingCounter", Math.min(10, + Integer.parseInt(EntityStatHelper.getStat(event.source.getEntity(), "BlessingCounter")) + 1)); } } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/GuardianBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/GuardianBlessing.java index a103221..cf1388c 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/GuardianBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/GuardianBlessing.java @@ -7,7 +7,7 @@ public class GuardianBlessing extends StandardBlessing { public GuardianBlessing() { super("Guardian"); } - + @Override public String name() { return "Guardian"; @@ -19,8 +19,7 @@ public class GuardianBlessing extends StandardBlessing { } @Override - public float onIncomingDamage(LivingHurtEvent lhev, - float damageMultiplier) { + public float onIncomingDamage(LivingHurtEvent lhev, float damageMultiplier) { return damageMultiplier - 0.2f; } } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/HunterBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/HunterBlessing.java index 88100e1..baf9d8c 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/HunterBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/HunterBlessing.java @@ -18,14 +18,12 @@ public class HunterBlessing extends StandardBlessing { @Override public void correctBlessing(Entity ent) { if (!(ent instanceof IRangedAttackMob)) { - ent.getEntityData().setString("Blessing", - "BlessingWarrior"); + ent.getEntityData().setString("Blessing", "BlessingWarrior"); } } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { if (event.source.isProjectile()) { return damageMultiplier + 0.2f; } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/InfernoBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/InfernoBlessing.java index c3d3b3f..942673f 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/InfernoBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/InfernoBlessing.java @@ -21,7 +21,10 @@ public class InfernoBlessing extends StandardBlessing { @Override public String description() { - return "Benefit: Take no fire damage, and do increased damage while on fire\nDrawback: Take damge while wet"; + return "Benefit: Take no fire damage"; + + // return "Benefit: Take no fire damage, and do increased damage while on + // fire\nDrawback: Take damge while wet"; } @Override @@ -32,15 +35,9 @@ public class InfernoBlessing extends StandardBlessing { } @Override - public float onIncomingDamage(LivingHurtEvent event, - float damageMultiplier) { - if (event.source.isFireDamage() - || event.source.getDamageType() - .equals("inFire") - || event.source.getDamageType() - .equals("onFire") - || event.source.getDamageType() - .equals("lava")) { + public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) { + if (event.source.isFireDamage() || event.source.getDamageType().equals("inFire") + || event.source.getDamageType().equals("onFire") || event.source.getDamageType().equals("lava")) { event.setCanceled(true); return 0; @@ -50,10 +47,9 @@ public class InfernoBlessing extends StandardBlessing { } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { if (event.source.getEntity().isBurning()) { - return damageMultiplier + 0.35f; + // return damageMultiplier + 0.35f; } return damageMultiplier; diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/LonerBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/LonerBlessing.java index fa44795..3bae3dc 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/LonerBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/LonerBlessing.java @@ -15,14 +15,10 @@ public class LonerBlessing extends StandardBlessing { } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { if (event.source.getEntity() instanceof EntityLivingBase) { - float scaleFactor = 1.0F - - (((EntityLivingBase) event.source - .getEntity()).getHealth() - / ((EntityLivingBase) event.source - .getEntity()).getMaxHealth()); + float scaleFactor = 1.0F - (((EntityLivingBase) event.source.getEntity()).getHealth() + / ((EntityLivingBase) event.source.getEntity()).getMaxHealth()); return damageMultiplier + 0.35F * scaleFactor; } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/LooterBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/LooterBlessing.java index 80fed2b..cb1cb38 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/LooterBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/LooterBlessing.java @@ -9,7 +9,7 @@ public class LooterBlessing extends StandardBlessing { public LooterBlessing() { super("Looter", false); } - + @Override public String description() { return "Enemies have a chance to drop dungeon loot"; @@ -19,10 +19,7 @@ public class LooterBlessing extends StandardBlessing { public void onMobKill(LivingDeathEvent event) { if (ModjamMod.r.nextInt(50) == 0) { if (!event.entity.worldObj.isRemote) { - event.entity.dropItem(ChestGenHooks - .getOneItem(ChestGenHooks.DUNGEON_CHEST, - ModjamMod.r) - .getItem(), 1); + event.entity.dropItem(ChestGenHooks.getOneItem(ChestGenHooks.DUNGEON_CHEST, ModjamMod.r).getItem(), 1); } } } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/LumberjackBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/LumberjackBlessing.java index e4136dc..c180671 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/LumberjackBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/LumberjackBlessing.java @@ -26,13 +26,11 @@ public class LumberjackBlessing extends StandardBlessing { } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { ItemStack held = null; if (event.source.getEntity() instanceof EntityLivingBase) { - held = ((EntityLivingBase) event.source - .getEntity()).getHeldItem(); + held = ((EntityLivingBase) event.source.getEntity()).getHeldItem(); } if (held != null && itemIsAxe(held)) { @@ -44,9 +42,7 @@ public class LumberjackBlessing extends StandardBlessing { private boolean itemIsAxe(ItemStack held) { if (held.getItem() instanceof ItemTool) { - return ((ItemTool) held.getItem()) - .getToolClasses(held) - .contains("axe"); + return ((ItemTool) held.getItem()).getToolClasses(held).contains("axe"); } return false; diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/MechanicBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/MechanicBlessing.java index e992d17..c1e8138 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/MechanicBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/MechanicBlessing.java @@ -6,7 +6,7 @@ public class MechanicBlessing extends StandardBlessing { public MechanicBlessing() { super("Mechanic", false); } - + @Override public String name() { return "Mechanic"; diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/MinerBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/MinerBlessing.java index a73d019..5eb9d36 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/MinerBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/MinerBlessing.java @@ -20,20 +20,17 @@ public class MinerBlessing extends StandardBlessing { @Override public void checkBreakSpeed(BreakSpeed pebsev) { - if (pebsev.block.getMaterial() == Material.rock - || pebsev.block.getMaterial() == Material.iron) { + if (pebsev.block.getMaterial() == Material.rock || pebsev.block.getMaterial() == Material.iron) { pebsev.newSpeed = pebsev.originalSpeed * 1.25F; } } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { ItemStack held = null; if (event.source.getEntity() instanceof EntityLivingBase) { - held = ((EntityLivingBase) event.source - .getEntity()).getHeldItem(); + held = ((EntityLivingBase) event.source.getEntity()).getHeldItem(); } if (held != null && itemIsPickaxe(held)) { @@ -45,9 +42,7 @@ public class MinerBlessing extends StandardBlessing { private boolean itemIsPickaxe(ItemStack held) { if (held.getItem() instanceof ItemTool) { - return ((ItemTool) held.getItem()) - .getToolClasses(held) - .contains("pickaxe"); + return ((ItemTool) held.getItem()).getToolClasses(held).contains("pickaxe"); } return false; diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/NinjaBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/NinjaBlessing.java index 1d61065..b4f66e6 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/NinjaBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/NinjaBlessing.java @@ -11,7 +11,7 @@ public class NinjaBlessing extends StandardBlessing { public NinjaBlessing() { super("Ninja", false); } - + @Override public String description() { return "- Go invisible while sneaking\n- Attacks on enemies with full health deal 2x damage"; @@ -20,27 +20,18 @@ public class NinjaBlessing extends StandardBlessing { @Override public void commonTick(ServerTickEvent stev, EntityPlayer player) { if (player.isSneaking()) { - PotionEffect e = player.getActivePotionEffect( - Potion.invisibility); + PotionEffect e = player.getActivePotionEffect(Potion.invisibility); - if (e == null || player.getActivePotionEffect( - Potion.invisibility) - .getDuration() < 10) { - player.addPotionEffect(new PotionEffect( - Potion.invisibility.id, 10, - 1, false)); + if (e == null || player.getActivePotionEffect(Potion.invisibility).getDuration() < 10) { + player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 10, 1, false)); } } } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { - if (event.entityLiving != null - && event.source.getEntity().isSneaking() - && event.entityLiving - .getHealth() == event.entityLiving - .getMaxHealth()) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { + if (event.entityLiving != null && event.source.getEntity().isSneaking() + && event.entityLiving.getHealth() == event.entityLiving.getMaxHealth()) { return damageMultiplier + 1.0F; } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/PaladinBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/PaladinBlessing.java index b5be58b..0b8a3ab 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/PaladinBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/PaladinBlessing.java @@ -14,8 +14,7 @@ public class PaladinBlessing extends StandardBlessing { } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { if (event.entityLiving.isEntityUndead()) { return damageMultiplier + .2f; } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/ParatrooperBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/ParatrooperBlessing.java index ec02d76..3010873 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/ParatrooperBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/ParatrooperBlessing.java @@ -7,21 +7,20 @@ public class ParatrooperBlessing extends StandardBlessing { public ParatrooperBlessing() { super("Paratrooper"); } - + @Override public String description() { return "Take no fall damage"; } @Override - public float onIncomingDamage(LivingHurtEvent event, - float damageMultiplier) { - if(event.source.damageType.equals("fall")) { + public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) { + if (event.source.damageType.equals("fall")) { event.setCanceled(true); - + return 0; } - + return damageMultiplier; } } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/PorcupineBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/PorcupineBlessing.java index 73f5dc2..7763bac 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/PorcupineBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/PorcupineBlessing.java @@ -18,24 +18,17 @@ public class PorcupineBlessing extends StandardBlessing { } @Override - public float onIncomingDamage(LivingHurtEvent event, - float damageMultiplier) { + public float onIncomingDamage(LivingHurtEvent event, float damageMultiplier) { DamageSource damageSource = event.source; Entity source = damageSource.getEntity(); - if (source != null && source instanceof EntityLivingBase - && !damageSource.isProjectile() - && (damageSource.getDamageType() - .equals("mob") - || damageSource.getDamageType() - .equals("player"))) { + if (source != null && source instanceof EntityLivingBase && !damageSource.isProjectile() + && (damageSource.getDamageType().equals("mob") || damageSource.getDamageType().equals("player"))) { - DamageSource damage = DamageSource - .causeThornsDamage(source); + DamageSource damage = DamageSource.causeThornsDamage(source); - ((EntityLivingBase) source).attackEntityFrom( - damage, event.ammount * 0.07F); + ((EntityLivingBase) source).attackEntityFrom(damage, event.ammount * 0.07F); } return damageMultiplier; diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/ScholarBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/ScholarBlessing.java index f4cbe65..d89d232 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/ScholarBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/ScholarBlessing.java @@ -14,14 +14,12 @@ public class ScholarBlessing extends StandardBlessing { } @Override - public float adjustMobKnowledgeBonus(LivingHurtEvent lhev, - float pickedDamageBonus) { + public float adjustMobKnowledgeBonus(LivingHurtEvent lhev, float pickedDamageBonus) { return pickedDamageBonus + (pickedDamageBonus * 0.5f); } - + @Override - public float adjustWeaponKnowledgeBonus(LivingHurtEvent lhev, - float pickedDamageBonus) { + public float adjustWeaponKnowledgeBonus(LivingHurtEvent lhev, float pickedDamageBonus) { return pickedDamageBonus + (pickedDamageBonus * 0.5f); } } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/SwampBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/SwampBlessing.java index 21c3fc8..24c9f35 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/SwampBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/SwampBlessing.java @@ -16,15 +16,11 @@ public class SwampBlessing extends StandardBlessing { } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { if (event.entityLiving != null) { - event.entityLiving - .addPotionEffect(new PotionEffect( - Potion.moveSlowdown.id, - 100, 1, false)); + event.entityLiving.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 100, 1, false)); } - + return damageMultiplier; } } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/ThickSkinnedBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/ThickSkinnedBlessing.java index 9504eb0..978d962 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/ThickSkinnedBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/ThickSkinnedBlessing.java @@ -7,7 +7,7 @@ public class ThickSkinnedBlessing extends StandardBlessing { public ThickSkinnedBlessing() { super("Thick-Skinned"); } - + @Override public String description() { return "Reduce damage taken by a flat amount"; @@ -16,7 +16,7 @@ public class ThickSkinnedBlessing extends StandardBlessing { @Override public float onIncomingDamage(LivingHurtEvent lhev, float damageMultiplier) { lhev.ammount = Math.max(0.5f, lhev.ammount - 1f); - + return damageMultiplier; } } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/ThiefBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/ThiefBlessing.java index 267054f..b83472a 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/ThiefBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/ThiefBlessing.java @@ -16,10 +16,9 @@ public class ThiefBlessing extends StandardBlessing { @Override public void onMobKill(LivingDeathEvent event) { - if(ModjamMod.r.nextInt(20) == 0) { + if (ModjamMod.r.nextInt(20) == 0) { if (!event.entity.worldObj.isRemote) { - event.entity.dropItem(Items.gold_nugget, - 1); + event.entity.dropItem(Items.gold_nugget, 1); } } } diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/VampireBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/VampireBlessing.java index 914f9c6..25515ee 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/VampireBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/VampireBlessing.java @@ -14,12 +14,9 @@ public class VampireBlessing extends StandardBlessing { } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { if (event.source.getEntity() instanceof EntityLivingBase) { - ((EntityLivingBase) event.source.getEntity()).heal( - (event.ammount * damageMultiplier) - * 0.07F); + ((EntityLivingBase) event.source.getEntity()).heal((event.ammount * damageMultiplier) * 0.07F); } return damageMultiplier; diff --git a/YWD/src/main/java/fyresmodjam/blessings/standard/WarriorBlessing.java b/YWD/src/main/java/fyresmodjam/blessings/standard/WarriorBlessing.java index 83fed42..e264531 100644 --- a/YWD/src/main/java/fyresmodjam/blessings/standard/WarriorBlessing.java +++ b/YWD/src/main/java/fyresmodjam/blessings/standard/WarriorBlessing.java @@ -17,17 +17,13 @@ public class WarriorBlessing extends StandardBlessing { @Override public void correctBlessing(Entity ent) { if (ent instanceof IRangedAttackMob) { - ent.getEntityData().setString("Blessing", - "BlessingHunter"); + ent.getEntityData().setString("Blessing", "BlessingHunter"); } } @Override - public float onOutgoingDamage(LivingHurtEvent event, - float damageMultiplier) { - if ((event.source.getDamageType().equals("player") - || event.source.getDamageType() - .equals("mob"))) { + public float onOutgoingDamage(LivingHurtEvent event, float damageMultiplier) { + if ((event.source.getDamageType().equals("player") || event.source.getDamageType().equals("mob"))) { return damageMultiplier + 0.2f; } -- cgit v1.2.3