Add altar input item safety checks

Elite-Modding-Team · Jun 13, 2024 · 19e0195 · 19e0195
1 parent 4bb05bd
commit 19e0195
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/mod/emt/harkenscythe/blocks/HSBloodAltar.java b/src/main/java/mod/emt/harkenscythe/blocks/HSBloodAltar.java
@@ -57,11 +57,12 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En
         if (te instanceof HSTileEntityBloodAltar)
         {
             HSTileEntityBloodAltar altar = (HSTileEntityBloodAltar) te;
+            ItemStack altarItem = altar.getInputStack();
             ItemStack heldItem = player.getHeldItem(hand);
 
             if (heldItem.getItem() == HSItems.harken_athame)
             {
-                if (altar.isValidRecipe())
+                if (!altarItem.isEmpty() && altar.isValidRecipe())
                 {
                     Item item = altar.getInputStack().getItem();
                     int requiredBloods = HSAltarRecipes.getRequiredBlood(altar.getInputStack().getItem());
@@ -81,7 +82,6 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En
             }
             else if (!heldItem.isEmpty())
             {
-                ItemStack altarItem = altar.getInputStack();
                 if (altarItem.isEmpty())
                 {
                     altar.setInputStack(heldItem.splitStack(1));

diff --git a/src/main/java/mod/emt/harkenscythe/blocks/HSSoulAltar.java b/src/main/java/mod/emt/harkenscythe/blocks/HSSoulAltar.java
@@ -57,11 +57,12 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En
         if (te instanceof HSTileEntitySoulAltar)
         {
             HSTileEntitySoulAltar altar = (HSTileEntitySoulAltar) te;
+            ItemStack altarItem = altar.getInputStack();
             ItemStack heldItem = player.getHeldItem(hand);
 
             if (heldItem.getItem() == HSItems.harken_athame)
             {
-                if (altar.isValidRecipe())
+                if (!altarItem.isEmpty() && altar.isValidRecipe())
                 {
                     Item item = altar.getInputStack().getItem();
                     int requiredSouls = HSAltarRecipes.getRequiredSouls(altar.getInputStack().getItem());
@@ -81,7 +82,6 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En
             }
             else if (!heldItem.isEmpty())
             {
-                ItemStack altarItem = altar.getInputStack();
                 if (altarItem.isEmpty())
                 {
                     altar.setInputStack(heldItem.splitStack(1));