Even though this isn't actually my issue, this will make the code mor…

…e robust. Fixed #22
DoubleDoorDevelopment · Mar 23, 2017 · d826c02 · d826c02
1 parent f3996d2
commit d826c02
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/main/java/net/doubledoordev/d3core/util/EventHandler.java b/src/main/java/net/doubledoordev/d3core/util/EventHandler.java
@@ -137,7 +137,7 @@ private EventHandler() {}
     @SubscribeEvent(priority = EventPriority.LOWEST)
     public void itemTooltipEventHandler(ItemTooltipEvent event)
     {
-        if (event.isShowAdvancedItemTooltips())
+        if (event.isShowAdvancedItemTooltips() && !event.getItemStack().isEmpty())
         {
             if (enableStringID) event.getToolTip().add(TextFormatting.DARK_AQUA + event.getItemStack().getItem().getRegistryName().toString());
             if (enableUnlocalizedName) event.getToolTip().add(TextFormatting.DARK_GREEN + event.getItemStack().getUnlocalizedName());
@@ -197,7 +197,7 @@ public void playerDeath(LivingDeathEvent event)
             {
 
             }            
-            ((EntityPlayer) event.getEntityLiving()).sendMessage(new TextComponentString("You died at ").setStyle(new Style().setColor(TextFormatting.AQUA)).appendSibling(posText));
+            event.getEntityLiving().sendMessage(new TextComponentString("You died at ").setStyle(new Style().setColor(TextFormatting.AQUA)).appendSibling(posText));
         }
     }
 
@@ -215,7 +215,6 @@ public void aprilFools(ServerChatEvent event)
     {
         if (D3Core.isAprilFools())
         {
-
             Style style = event.getComponent().getStyle();
             float chance = 0.25f;
             if (CoreConstants.RANDOM.nextFloat() < chance)