Updated against new mc-dev format, takes out quite some casting troubles at the cost of extra ()'s

src/main/java/net/minecraft/server/EntityZombie.java

@@ -1,13 +1,13 @@
 package net.minecraft.server;
 
-
 import java.util.Random;
 
+// CraftBukkit start
 import org.bukkit.craftbukkit.CraftLivingEntity;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.entity.EntityCombustEvent;
-
+// CraftBukkit end
 
 public class EntityZombie extends EntityMobs {
 
@@ -23,14 +23,14 @@ public class EntityZombie extends EntityMobs {
             float f1 = b(1.0F);
 
             if (f1 > 0.5F && l.h(MathHelper.b(p), MathHelper.b(q), MathHelper.b(r)) && W.nextFloat() * 30F < (f1 - 0.4F) * 2.0F) {
-                //Craftbukkit start
+                // CraftBukkit start
                 CraftServer server = ((WorldServer) l).getServer();
                 EntityCombustEvent event = new EntityCombustEvent(Type.ENTITY_COMBUST, new CraftLivingEntity(server, (EntityLiving) this));
                 server.getPluginManager().callEvent(event);
                 if (!event.isCancelled()) {
                     Z = 300;
                 }
-                //Craftbukkit stop
+                // CraftBukkit end
             }
         }
         super.G();
@@ -52,4 +52,3 @@ public class EntityZombie extends EntityMobs {
         return Item.J.aW;
     }
 }
-