From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/curses/CurseDeathsTouch.java | 58 +++++++++++----------- 1 file changed, 30 insertions(+), 28 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java (limited to 'src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java') diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java old mode 100644 new mode 100755 index 92e2dfa..aeb3e22 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java @@ -10,35 +10,37 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingAttackEvent; -public class CurseDeathsTouch extends Curse -{ - public CurseDeathsTouch(String name, int txtID, String pack) - { - super(name, txtID, pack); - } - - @Override - public boolean attackedByPlayerActionCancelable(LivingAttackEvent event, World world, EntityPlayer player, Entity target) - { - if (!world.isRemote) target.attackEntityFrom(DamageSource.wither, event.ammount); - return true; - } - - public String getDescription() - { - return StatCollector.translateToLocal("curse." + Variables.MODID + ".deathsTouch.description"); - } - +public class CurseDeathsTouch extends Curse { + public CurseDeathsTouch(String name, int txtID, String pack) { + super(name, txtID, pack); + } + + @Override + public boolean attackedByPlayerActionCancelable( + LivingAttackEvent event, World world, EntityPlayer player, + Entity target) { + if (!world.isRemote) { + target.attackEntityFrom(DamageSource.wither, event.ammount); + } + + return true; + } + + @Override + public String getDescription() { + return StatCollector.translateToLocal( + "curse." + Variables.MODID + ".deathsTouch.description"); + } + + @Override + public String getDisplayName() { + return StatCollector.translateToLocal( + "curse." + Variables.MODID + ".deathsTouch"); + } + @Override - public String getDisplayName() - { - return StatCollector.translateToLocal("curse." + Variables.MODID + ".deathsTouch"); + public boolean canCurseBeActivated() { + return ConfigHandler.CURSE_DEATHS_TOUCH; } - @Override - public boolean canCurseBeActivated() - { - return ConfigHandler.CURSE_DEATHS_TOUCH; - } - } -- cgit v1.2.3