From 2d78a84df10ff281d1f1c1ec66bbe67259845987 Mon Sep 17 00:00:00 2001
From: rjnasers <rjnasers@iastate.edu>
Date: Wed, 26 Apr 2023 16:20:41 -0500
Subject: [PATCH] Apply spotless and fixing keeping item on death

---
 src/main/java/magicbees/client/gui/ContainerEffectRing.java | 6 ++++--
 src/main/java/magicbees/item/ItemBeeRing.java               | 6 +-----
 .../java/magicbees/itemInventories/InventoryBeeRing.java    | 6 +++++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/magicbees/client/gui/ContainerEffectRing.java b/src/main/java/magicbees/client/gui/ContainerEffectRing.java
index 9addac8..2a6a423 100644
--- a/src/main/java/magicbees/client/gui/ContainerEffectRing.java
+++ b/src/main/java/magicbees/client/gui/ContainerEffectRing.java
@@ -1,12 +1,14 @@
 package magicbees.client.gui;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import magicbees.itemInventories.InventoryBeeRing;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+
 public class ContainerEffectRing extends Container {
 
     InventoryBeeRing IBR;
@@ -14,7 +16,7 @@ public class ContainerEffectRing extends Container {
     public ContainerEffectRing(InventoryBeeRing IBR, EntityPlayer player) {
         this.IBR = IBR;
         this.addSlotToContainer(
-            new SlotCustomItems(this.IBR, 0, 80, 22, GameRegistry.findItemStack("Forestry", "beeDroneGE", 1)));
+                new SlotCustomItems(this.IBR, 0, 80, 22, GameRegistry.findItemStack("Forestry", "beeDroneGE", 1)));
 
         for (int i = 0; i < 3; ++i) {
             for (int j = 0; j < 9; ++j) {
diff --git a/src/main/java/magicbees/item/ItemBeeRing.java b/src/main/java/magicbees/item/ItemBeeRing.java
index 7ddc4a9..184cb50 100644
--- a/src/main/java/magicbees/item/ItemBeeRing.java
+++ b/src/main/java/magicbees/item/ItemBeeRing.java
@@ -146,17 +146,13 @@ public class ItemBeeRing extends Item implements IBauble {
         RingHousing housingLogic = new RingHousing(player, IBR);
 
         IBR.setEffectAndInitialize(queen);
-
         IBR.effectData = queen.doEffect(IBR.effectData, housingLogic);
-        if (player.isDead) {
-            return;
-        }
-
         IBR.writeEffectNBT();
 
         // Crashes irregularly for some reason I can't figure out, but this is just the bee effects around you, so it's
         // not a huge deal. It would be nice to have though
         // I will get around to it later. (Crash has something to do with entityFX when the player is moving)
+
         // if (player.getEntityWorld().getWorldTime() % 5 == 0) {
         // IBR.effectData = queen.doFX(IBR.effectData, housingLogic);
         // }
diff --git a/src/main/java/magicbees/itemInventories/InventoryBeeRing.java b/src/main/java/magicbees/itemInventories/InventoryBeeRing.java
index 7848150..dcada09 100644
--- a/src/main/java/magicbees/itemInventories/InventoryBeeRing.java
+++ b/src/main/java/magicbees/itemInventories/InventoryBeeRing.java
@@ -159,13 +159,17 @@ public class InventoryBeeRing implements IInventory {
     }
 
     private void setInventorySlot(ItemStack parent) {
+
+        if (this.player.getHealth() == 0) {
+            return;
+        }
+
         if (baubleFlag) {
             InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(this.player);
             baubles.setInventorySlotContents(itemLocatedSlot, parent);
         } else {
             player.inventory.setInventorySlotContents(itemLocatedSlot, parent);
         }
-
     }
 
     public void setCurrentBeeHealth(int health) {