From 01d4bdffa29fed2d86a57eb57f9c389eec786a66 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 14 Feb 2016 08:26:19 -0500 Subject: [PATCH] Fixed Sacrificial Dagger so it properly bypasses armour reduction checks. --- changelog.txt | 1 + .../WayofTime/bloodmagic/item/ItemSacrificialDagger.java | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 955bc16a..dc62620d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -12,6 +12,7 @@ Version 2.0.0-17 - Phantom Bridge - Ender Severance - Haste +- Dagger now bypasses checks of armour ------------------------------------------------------ Version 2.0.0-16 diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 17329c3d..207149f9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -103,7 +103,14 @@ public class ItemSacrificialDagger extends Item if (evt.shouldDrainHealth) { player.hurtResistantTime = 0; - player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 2.0F); + player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 0.001F); + player.setHealth(Math.max(player.getHealth() - 2, 0.0001f)); + if (player.getHealth() <= 0.001f) + { + player.onDeath(BloodMagicAPI.getDamageSource()); + player.setHealth(0); + } +// player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 2.0F); } if (!evt.shouldFillAltar)