diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 7a4645fd0e..06ceb23ad0 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -125,6 +125,13 @@ public class WorldServer extends World {
         return result;
     }
 
+    @Override
+    public boolean a(int i1, int j1, int k1, int l1, int i2) {
+        boolean result = super.a(i1, j1, k1, l1, i2);
+        if ((result) && (world != null)) world.updateBlock(i1, j1, k1);
+        return result;
+    }
+
     @Override
     public void a(int i1, int j1, int k1, TileEntity tileentity) {
         super.a(i1, j1, k1, tileentity);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
index a776d9f337..b04967f952 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
@@ -1,15 +1,15 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityAnimals;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Animals;
-
-public class CraftAnimals extends CraftCreature implements Animals{
-
-    public CraftAnimals(CraftServer server, EntityAnimals entity) {
-        super(server, entity);
-    }
-
-
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityAnimals;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Animals;
+
+public class CraftAnimals extends CraftCreature implements Animals{
+
+    public CraftAnimals(CraftServer server, EntityAnimals entity) {
+        super(server, entity);
+    }
+
+
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
index 549fcb7209..be5eed22b6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
@@ -1,13 +1,13 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityChicken;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Chicken;
-
-public class CraftChicken extends CraftAnimals implements Chicken{
-
-    public CraftChicken(CraftServer server, EntityChicken entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityChicken;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Chicken;
+
+public class CraftChicken extends CraftAnimals implements Chicken{
+
+    public CraftChicken(CraftServer server, EntityChicken entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java
index aeb9f36b8c..4d8c6a79de 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java
@@ -1,13 +1,13 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityCow;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Cow;
-
-public class CraftCow extends CraftAnimals implements Cow {
-
-    public CraftCow(CraftServer server, EntityCow entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityCow;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Cow;
+
+public class CraftCow extends CraftAnimals implements Cow {
+
+    public CraftCow(CraftServer server, EntityCow entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
index d4a13f98bb..fc904e10ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
@@ -1,13 +1,13 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityCreature;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Creature;
-
-public class CraftCreature extends CraftLivingEntity implements Creature{
-
-    public CraftCreature(CraftServer server, EntityCreature entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityCreature;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Creature;
+
+public class CraftCreature extends CraftLivingEntity implements Creature{
+
+    public CraftCreature(CraftServer server, EntityCreature entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
index fddb54a409..f193111f03 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
@@ -1,13 +1,13 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityCreeper;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Creeper;
-
-public class CraftCreeper extends CraftMonster implements Creeper {
-
-    public CraftCreeper(CraftServer server, EntityCreeper entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityCreeper;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Creeper;
+
+public class CraftCreeper extends CraftMonster implements Creeper {
+
+    public CraftCreeper(CraftServer server, EntityCreeper entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
index 737c4c703c..494100d5ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
@@ -1,15 +1,15 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityFallingSand;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.entity.FallingSand;
-
-public class CraftFallingSand extends CraftEntity implements FallingSand {
-
-    public CraftFallingSand(CraftServer server, EntityFallingSand entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityFallingSand;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.entity.FallingSand;
+
+public class CraftFallingSand extends CraftEntity implements FallingSand {
+
+    public CraftFallingSand(CraftServer server, EntityFallingSand entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
index 56789c5e09..f4597e3791 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
@@ -1,17 +1,17 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityFireball;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Fireball;
-
-/**
- * A Fireball.
- * 
- * @author Cogito
- */
-public class CraftFireball extends CraftEntity implements Fireball {
-    public CraftFireball(CraftServer server, EntityFireball entity) {
-        super(server, entity);
-    }
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityFireball;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Fireball;
+
+/**
+ * A Fireball.
+ * 
+ * @author Cogito
+ */
+public class CraftFireball extends CraftEntity implements Fireball {
+    public CraftFireball(CraftServer server, EntityFireball entity) {
+        super(server, entity);
+    }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
index 0ebd3a94dd..85699a7d27 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
@@ -1,17 +1,17 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityFish;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Fish;
-
-/**
- * A Fish.
- * 
- * @author Cogito
- */
-public class CraftFish extends CraftEntity implements Fish {
-    public CraftFish(CraftServer server, EntityFish entity) {
-        super(server, entity);
-    }
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityFish;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Fish;
+
+/**
+ * A Fish.
+ * 
+ * @author Cogito
+ */
+public class CraftFish extends CraftEntity implements Fish {
+    public CraftFish(CraftServer server, EntityFish entity) {
+        super(server, entity);
+    }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
index da1f4eba05..a6a95003de 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
@@ -1,13 +1,13 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityFlying;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Flying;
-
-public class CraftFlying extends CraftLivingEntity implements Flying {
-
-    public CraftFlying(CraftServer server, EntityFlying entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityFlying;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Flying;
+
+public class CraftFlying extends CraftLivingEntity implements Flying {
+
+    public CraftFlying(CraftServer server, EntityFlying entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
index 27258ad0c6..261cf603a4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
@@ -1,13 +1,13 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityGhast;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Ghast;
-
-public class CraftGhast extends CraftFlying implements Ghast {
-
-    public CraftGhast(CraftServer server, EntityGhast entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityGhast;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Ghast;
+
+public class CraftGhast extends CraftFlying implements Ghast {
+
+    public CraftGhast(CraftServer server, EntityGhast entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java
index 14ff5dfdd0..9e47eb7154 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityZombieSimple;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Giant;
-
-public class CraftGiant extends CraftMonster implements Giant {
-
-    public CraftGiant(CraftServer server, EntityZombieSimple entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityZombieSimple;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Giant;
+
+public class CraftGiant extends CraftMonster implements Giant {
+
+    public CraftGiant(CraftServer server, EntityZombieSimple entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
index ded31774a9..556c56fe67 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityItem;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Item;
-
-public class CraftItem extends CraftEntity implements Item {
-
-    public CraftItem(CraftServer server, EntityItem entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityItem;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Item;
+
+public class CraftItem extends CraftEntity implements Item {
+
+    public CraftItem(CraftServer server, EntityItem entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java
index 2e459a70d9..7973c01821 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityMobs;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Monster;
-
-public class CraftMonster extends CraftCreature implements Monster {
-
-    public CraftMonster(CraftServer server, EntityMobs entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityMobs;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Monster;
+
+public class CraftMonster extends CraftCreature implements Monster {
+
+    public CraftMonster(CraftServer server, EntityMobs entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
index 3d070f8269..11b718a29d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityPainting;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Painting;
-
-public class CraftPainting extends CraftEntity implements Painting {
-
-    public CraftPainting(CraftServer server, EntityPainting entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityPainting;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Painting;
+
+public class CraftPainting extends CraftEntity implements Painting {
+
+    public CraftPainting(CraftServer server, EntityPainting entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java
index 91de7c3717..8b3e8c2c81 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java
@@ -1,15 +1,15 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityPig;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftAnimals;
-import org.bukkit.entity.Pig;
-
-public class CraftPig extends CraftAnimals implements Pig {
-
-    public CraftPig(CraftServer server, EntityPig entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityPig;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftAnimals;
+import org.bukkit.entity.Pig;
+
+public class CraftPig extends CraftAnimals implements Pig {
+
+    public CraftPig(CraftServer server, EntityPig entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java
index e0cd7d54f5..1d1733c782 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityPigZombie;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.PigZombie;
-
-public class CraftPigZombie extends CraftZombie implements PigZombie {
-
-    public CraftPigZombie(CraftServer server, EntityPigZombie entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityPigZombie;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.PigZombie;
+
+public class CraftPigZombie extends CraftZombie implements PigZombie {
+
+    public CraftPigZombie(CraftServer server, EntityPigZombie entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
index a278080447..efd098d1f6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntitySheep;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Sheep;
-
-public class CraftSheep extends CraftAnimals implements Sheep {
-
-    public CraftSheep(CraftServer server, EntitySheep entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySheep;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Sheep;
+
+public class CraftSheep extends CraftAnimals implements Sheep {
+
+    public CraftSheep(CraftServer server, EntitySheep entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
index 6d62f3b4ff..ba3ae6e75f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntitySkeleton;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Skeleton;
-
-public class CraftSkeleton extends CraftMonster implements Skeleton {
-
-    public CraftSkeleton(CraftServer server, EntitySkeleton entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySkeleton;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Skeleton;
+
+public class CraftSkeleton extends CraftMonster implements Skeleton {
+
+    public CraftSkeleton(CraftServer server, EntitySkeleton entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
index 67317bae1b..4a0a6105e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntitySlime;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Slime;
-
-public class CraftSlime extends CraftLivingEntity implements Slime {
-
-    public CraftSlime(CraftServer server, EntitySlime entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySlime;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Slime;
+
+public class CraftSlime extends CraftLivingEntity implements Slime {
+
+    public CraftSlime(CraftServer server, EntitySlime entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java
index 7c2c443747..f026a52df4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntitySpider;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Spider;
-
-public class CraftSpider extends CraftMonster implements Spider {
-
-    public CraftSpider(CraftServer server, EntitySpider entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySpider;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Spider;
+
+public class CraftSpider extends CraftMonster implements Spider {
+
+    public CraftSpider(CraftServer server, EntitySpider entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java
index 6c56e76866..87240a38ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntitySquid;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Squid;
-
-public class CraftSquid extends CraftWaterMob implements Squid {
-
-    public CraftSquid(CraftServer server, EntitySquid entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySquid;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Squid;
+
+public class CraftSquid extends CraftWaterMob implements Squid {
+
+    public CraftSquid(CraftServer server, EntitySquid entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
index aacaff911e..89cc62220c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityTNTPrimed;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.TNTPrimed;
-
-public class CraftTNTPrimed extends CraftEntity implements TNTPrimed {
-
-    public CraftTNTPrimed(CraftServer server, EntityTNTPrimed entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityTNTPrimed;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.TNTPrimed;
+
+public class CraftTNTPrimed extends CraftEntity implements TNTPrimed {
+
+    public CraftTNTPrimed(CraftServer server, EntityTNTPrimed entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
index f4ff5a1084..6425fde400 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityWaterMob;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.WaterMob;
-
-public class CraftWaterMob extends CraftCreature implements WaterMob {
-
-    public CraftWaterMob(CraftServer server, EntityWaterMob entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityWaterMob;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.WaterMob;
+
+public class CraftWaterMob extends CraftCreature implements WaterMob {
+
+    public CraftWaterMob(CraftServer server, EntityWaterMob entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
index b71ff87a4d..b7e94edcd6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
@@ -1,14 +1,14 @@
-package org.bukkit.craftbukkit.entity;
-
-import net.minecraft.server.EntityZombie;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Zombie;
-
-public class CraftZombie extends CraftMonster implements Zombie{
-
-    public CraftZombie(CraftServer server, EntityZombie entity) {
-        super(server, entity);
-    }
-
-}
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityZombie;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Zombie;
+
+public class CraftZombie extends CraftMonster implements Zombie{
+
+    public CraftZombie(CraftServer server, EntityZombie entity) {
+        super(server, entity);
+    }
+
+}