- Made the ritual even better

- Fixed a type where the "Thieving Gloves" were named "Thiefing Gloves"
- Fixed the world from crashing when entering one
- Changed Flaming Soul Curse to set players on fire when they attack something, rather than randomly
- Player no longer gets blinded when the ritual starts
- The ritual now creates a sphere of darkness around it

2 files changed, 6 insertions, 22 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
index 06fb53a..34c9b7f 100644
--- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
@@ -439,16 +439,6 @@ public class EntityEventHandler
     @SideOnly (Side.CLIENT)
     public void fogColors(EntityViewRenderEvent.FogColors event)
     {
-        if (event.entity instanceof EntityPlayer){
-            EntityPlayer player = (EntityPlayer)event.entity;
-            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
-            if (persistTag.getBoolean("nearStartedRitual")){
-                event.red = 0f;
-                event.green = 0f;
-                event.blue = 0f;
-            }
-        }
-        if (event.isCancelable()) event.setCanceled(true);
     }
     
     /**
@@ -466,14 +456,5 @@ public class EntityEventHandler
     @SideOnly (Side.CLIENT)
     public void renderFog(EntityViewRenderEvent.RenderFogEvent event)
     {
-        if (event.entity instanceof EntityPlayer){
-            EntityPlayer player = (EntityPlayer)event.entity;
-            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
-            if (persistTag.getBoolean("nearStartedRitual")){
-                GL11.glFogi(GL11.GL_FOG_MODE, GL11.GL_EXP);
-                GL11.glFogf(GL11.GL_FOG_DENSITY, 0.6F);
-            }
-        }
-        if (event.isCancelable()) event.setCanceled(true);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
index 92b84ab..575eae3 100644
--- a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
@@ -113,9 +113,12 @@ public class PlayerRenderHandler
     {
         if (playersInfo != null){
             EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-            NBTTagCompound playerInfo = (NBTTagCompound)playersInfo.getTag(player.getDisplayName());
-            for(Curse curse: Curse.getCurseList())
-                if (playerInfo.getInteger(curse.getName()) > 0 && playerInfo.getInteger("cursePoints") > 0) curse.playerHandRender(player, event);
+            if (player != null){
+                NBTTagCompound playerInfo = (NBTTagCompound)playersInfo.getTag(player.getDisplayName());
+                for(Curse curse: Curse.getCurseList())
+                    if (curse != null && playerInfo != null && playerInfo.hasKey(curse.getName()) && playerInfo.getInteger(curse.getName()) > 0 && playerInfo.hasKey("cursePoints") && playerInfo.getInteger("cursePoints") > 0) 
+                        curse.playerHandRender(player, event);
+            }
         }
     }
 }