From 7c767b3bbf13805b7a9e180cbd19b702f2e16371 Mon Sep 17 00:00:00 2001
From: Phil <Phillip-Harner@users.noreply.github.com>
Date: Sun, 14 Apr 2019 11:29:51 -0400
Subject: [PATCH 1/2] Stop insertions into Demon Crucible if the inventory is
 not empty (#1567)

---
 src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java
index 7685e0fc..52ff0be5 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java
@@ -204,7 +204,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo
 
     @Override
     public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) {
-        return !stack.isEmpty() && (stack.getItem() instanceof IDemonWillGem || stack.getItem() instanceof IDiscreteDemonWill);
+        return !stack.isEmpty() && inventory.get(0).isEmpty() && (stack.getItem() instanceof IDemonWillGem || stack.getItem() instanceof IDiscreteDemonWill);
     }
 
     @Override

From 572d8eff4f44bfc89e7f4b6219b03a5b4d58dac8 Mon Sep 17 00:00:00 2001
From: Tobias Gremeyer <angryAEon@icloud.com>
Date: Sun, 14 Apr 2019 15:38:17 +0000
Subject: [PATCH 2/2] Possible fix to (many of the) abnormal death events
 concerning the sacrificial Dagger (#1554)

* Possible fix to (many of the) abnormal death events concerning the sacrifical dagger.

=> #1444

Works with Grim Reaper's Sprint, not tested for anything else.

* Being special, players can survive massive blood loss up until 1 heart remains.

(Math.floor() caused players to die when they sacrificed with 3 health remaining)
---
 .../bloodmagic/item/ItemSacrificialDagger.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
index 5410758f..a67cbced 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
@@ -94,14 +94,16 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
                 return super.onItemRightClick(world, player, hand);
 
             if (evt.shouldDrainHealth) {
+                DamageSourceBloodMagic damageSrc = DamageSourceBloodMagic.INSTANCE;
                 player.hurtResistantTime = 0;
-                player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 0.001F);
-                player.setHealth(Math.max(player.getHealth() - 2, 0.0001f));
-                if (player.getHealth() <= 0.001f) {
-                    player.onDeath(DamageSourceBloodMagic.INSTANCE);
-                    player.setHealth(0);
+                float playerHealth = player.getHealth();
+                if (Math.ceil(player.getHealth() - 2) <= 0) {
+                    player.attackEntityFrom(damageSrc, Float.MAX_VALUE);
+                } else {
+                    float damageAmount = net.minecraftforge.common.ForgeHooks.onLivingDamage(player, damageSrc, 2.0F);
+                    player.getCombatTracker().trackDamage(damageSrc, playerHealth, damageAmount);
+                    player.setHealth(Math.max(player.getHealth() - 2, 0.001f));
                 }
-//                player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 2.0F);
             }
 
             if (!evt.shouldFillAltar)