                      }
                  }
              }
-@@ -215,12 +260,60 @@
+@@ -215,12 +267,60 @@
                  var8 = (double)par1 + var6.maxX + (double)var7;
              }
  

             }
         }
     }
@@ -112,6 +135,26 @@
                 var10.draw();
             }
         }
+
+        for (String key : effectList.keySet())
+        {
+            ForgeHooksClient.bindTexture(key, 0);
+            for (EntityFX entry : effectList.get(key))
+            {                
+                Tessellator tessallator = Tessellator.instance;
+                //GL11.glBindTexture(GL11.GL_TEXTURE_2D, renderer.getTexture(key));
+                tessallator.startDrawingQuads();

     public EffectRenderer(World par1World, RenderEngine par2RenderEngine)
     {
         if (par1World != null)
@@ -52,12 +64,27 @@
             for (int var2 = 0; var2 < this.fxLayers[var1].size(); ++var2)
             {
                 EntityFX var3 = (EntityFX)this.fxLayers[var1].get(var2);
-                var3.onUpdate();
-
-                if (var3.isDead)
+
+                if (var3 != null)
+                {
+                    var3.onUpdate();
+                }
+
+                if (var3 == null || var3.isDead)
                 {
                     this.fxLayers[var1].remove(var2--);
                 }
