Line endings, damnit!

3 files changed, 227 insertions, 227 deletions

diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
index fe9b859f..cad9727e 100644
--- a/src/main/java/net/minecraft/server/ItemBucket.java
+++ b/src/main/java/net/minecraft/server/ItemBucket.java
@@ -53,7 +53,7 @@ public class ItemBucket extends Item {
                     if (world.getMaterial(i, j, k) == Material.WATER && world.getData(i, j, k) == 0) {
                         // CraftBukkit start
                         PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, i, j, k, -1, itemstack, Item.WATER_BUCKET);
-

+
                         if (event.isCancelled()) {
                             return itemstack;
                         }
@@ -68,7 +68,7 @@ public class ItemBucket extends Item {
 
                     if (world.getMaterial(i, j, k) == Material.LAVA && world.getData(i, j, k) == 0) {
                         // CraftBukkit start
-                        PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, i, j, k, -1, itemstack, Item.LAVA_BUCKET);

+                        PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, i, j, k, -1, itemstack, Item.LAVA_BUCKET);
 
                         if (event.isCancelled()) {
                             return itemstack;
@@ -84,7 +84,7 @@ public class ItemBucket extends Item {
                 } else {
                     if (this.a < 0) {
                         // CraftBukkit start
-                        PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, i, j, k, movingobjectposition.e, itemstack);

+                        PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, i, j, k, movingobjectposition.e, itemstack);
 
                         if (event.isCancelled()) {
                             return itemstack;
@@ -129,7 +129,7 @@ public class ItemBucket extends Item {
                             return itemstack;
                         }
                         // CraftBukkit end
-

+
                         if (world.m.d && this.a == Block.WATER.id) {
                             world.a(d0 + 0.5D, d1 + 0.5D, d2 + 0.5D, "random.fizz", 0.5F, 2.6F + (world.k.nextFloat() - world.k.nextFloat()) * 0.8F);
 
diff --git a/src/main/java/net/minecraft/server/ItemInWorldManager.java b/src/main/java/net/minecraft/server/ItemInWorldManager.java
index 23a926f1..2c1d4377 100644
--- a/src/main/java/net/minecraft/server/ItemInWorldManager.java
+++ b/src/main/java/net/minecraft/server/ItemInWorldManager.java
@@ -70,7 +70,7 @@ public class ItemInWorldManager {
             if (l == Block.WOODEN_DOOR.id) {
                 // For some reason *BOTH* the bottom/top part have to be marked updated.
                 boolean bottom = (this.b.getData(i, j, k) & 8) == 0;
-                ((EntityPlayer) this.a).a.b((Packet) (new Packet53BlockChange(i, j, k, this.b)));

+                ((EntityPlayer) this.a).a.b((Packet) (new Packet53BlockChange(i, j, k, this.b)));
                 ((EntityPlayer) this.a).a.b((Packet) (new Packet53BlockChange(i, j + (bottom ? 1 : -1), k, this.b)));
             }
         } else {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 46c527c6..5e8bcc28 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1,224 +1,224 @@
-package org.bukkit.craftbukkit.event;

-

-import net.minecraft.server.ChunkCoordinates;

-import net.minecraft.server.EntityChicken;

-import net.minecraft.server.EntityCow;

-import net.minecraft.server.EntityCreeper;

-import net.minecraft.server.EntityGhast;

-import net.minecraft.server.EntityGiantZombie;

-import net.minecraft.server.EntityHuman;

-import net.minecraft.server.EntityLiving;

-import net.minecraft.server.EntityPig;

-import net.minecraft.server.EntityPigZombie;

-import net.minecraft.server.EntitySheep;

-import net.minecraft.server.EntitySkeleton;

-import net.minecraft.server.EntitySlime;

-import net.minecraft.server.EntitySpider;

-import net.minecraft.server.EntitySquid;

-import net.minecraft.server.EntityZombie;

-import net.minecraft.server.Item;

-import net.minecraft.server.ItemStack;

-import net.minecraft.server.World;

-import net.minecraft.server.WorldServer;

-

-import org.bukkit.Material;

-import org.bukkit.block.Block;

-import org.bukkit.block.BlockFace;

-import org.bukkit.block.BlockState;

-import org.bukkit.craftbukkit.CraftServer;

-import org.bukkit.craftbukkit.CraftWorld;

-import org.bukkit.craftbukkit.block.CraftBlock;

-import org.bukkit.craftbukkit.inventory.CraftItemStack;

-import org.bukkit.entity.CreatureType;

-import org.bukkit.entity.Player;

-import org.bukkit.event.Event.Type;

-import org.bukkit.event.block.Action;

-import org.bukkit.event.block.BlockDamageEvent;

-import org.bukkit.event.block.BlockPlaceEvent;

-import org.bukkit.event.entity.CreatureSpawnEvent;

-import org.bukkit.event.player.PlayerBucketEmptyEvent;

-import org.bukkit.event.player.PlayerBucketFillEvent;

-import org.bukkit.event.player.PlayerEvent;

-import org.bukkit.event.player.PlayerInteractEvent;

-

-public class CraftEventFactory {

-    private static boolean canBuild(CraftWorld world, Player player, int x, int z) {

-        WorldServer worldServer = world.getHandle();

-        int spawnSize = worldServer.x.spawnProtection;

-

-        if (spawnSize <= 0) return true;

-        if (player.isOp()) return true;

-

-        ChunkCoordinates chunkcoordinates = worldServer.l();

-

-        int distanceFromSpawn = (int) Math.max(Math.abs(x - chunkcoordinates.a), Math.abs(z - chunkcoordinates.c));

-        return distanceFromSpawn > spawnSize;

-    }

-

-    /**

-     * Block place methods

-     */

-    public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ, int type) {

-        return callBlockPlaceEvent(world, who, replacedBlockState, clickedX, clickedY, clickedZ, net.minecraft.server.Block.byId[type]);

-    }

-

-    public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ, net.minecraft.server.Block block) {

-        return callBlockPlaceEvent(world, who, replacedBlockState, clickedX, clickedY, clickedZ, new ItemStack(block));

-    }

-

-    public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ, ItemStack itemstack) {

-        CraftWorld craftWorld = ((WorldServer) world).getWorld();

-        CraftServer craftServer = ((WorldServer) world).getServer();

-

-        Player player = (who == null) ? null : (Player) who.getBukkitEntity();

-        CraftItemStack itemInHand = new CraftItemStack(itemstack);

-

-        Block blockClicked = craftWorld.getBlockAt(clickedX, clickedY, clickedZ);

-        Block placedBlock = replacedBlockState.getBlock();

-

-        boolean canBuild = canBuild(craftWorld, player, placedBlock.getX(), placedBlock.getZ());

-

-        BlockPlaceEvent event = new BlockPlaceEvent(placedBlock, replacedBlockState, blockClicked, itemInHand, player, canBuild);

-        craftServer.getPluginManager().callEvent(event);

-

-        return event;

-    }

-

-    /**

-     * Bucket methods

-     */

-    public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand) {

-        return (PlayerBucketEmptyEvent) getPlayerBucketEvent(Type.PLAYER_BUCKET_EMPTY, who, clickedX, clickedY, clickedZ, clickedFace, itemInHand, Item.BUCKET);

-    }

-

-    public static PlayerBucketFillEvent callPlayerBucketFillEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand, net.minecraft.server.Item bucket) {

-        return (PlayerBucketFillEvent) getPlayerBucketEvent(Type.PLAYER_BUCKET_FILL, who, clickedX, clickedY, clickedZ, clickedFace, itemInHand, bucket);

-    }

-

-    private static PlayerEvent getPlayerBucketEvent(Type type, EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemstack, net.minecraft.server.Item item) {

-        Player player = (who == null) ? null : (Player) who.getBukkitEntity();

-        CraftItemStack itemInHand = new CraftItemStack(new ItemStack(item));

-        Material bucket = Material.getMaterial(itemstack.id);

-

-        CraftWorld craftWorld = (CraftWorld) player.getWorld();

-        CraftServer craftServer = (CraftServer) player.getServer();

-

-        Block blockClicked = craftWorld.getBlockAt(clickedX, clickedY, clickedZ);

-        BlockFace blockFace = CraftBlock.notchToBlockFace(clickedFace);

-

-        PlayerEvent event = null;

-        if (type == Type.PLAYER_BUCKET_EMPTY) {

-            event = new PlayerBucketEmptyEvent(player, blockClicked, blockFace, bucket, itemInHand);

-            ((PlayerBucketEmptyEvent) event).setCancelled(!canBuild(craftWorld, player, clickedX, clickedZ));

-        } else if(type == Type.PLAYER_BUCKET_FILL) {

-            event = new PlayerBucketFillEvent(player, blockClicked, blockFace, bucket, itemInHand);

-            ((PlayerBucketFillEvent) event).setCancelled(!canBuild(craftWorld, player, clickedX, clickedZ));

-        }

-

-        craftServer.getPluginManager().callEvent(event);

-

-        return event;

-    }

-

-    /**

-     * Player Interact event

-     */

-    

-    public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack) {

-        if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {

-            throw new IllegalArgumentException();

-        }

-        return callPlayerInteractEvent(who, action, 0, 255, 0, 0, itemstack);

-    }

-    public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemstack) {

-        Player player = (who == null) ? null : (Player) who.getBukkitEntity();

-        CraftItemStack itemInHand = new CraftItemStack(itemstack);

-

-        CraftWorld craftWorld = (CraftWorld) player.getWorld();

-        CraftServer craftServer = (CraftServer) player.getServer();

-

-        Block blockClicked = craftWorld.getBlockAt(clickedX, clickedY, clickedZ);

-        BlockFace blockFace = CraftBlock.notchToBlockFace(clickedFace);

-

-        if (clickedY == 255) {

-            blockClicked = null;

-            switch (action) {

-                case LEFT_CLICK_BLOCK:

-                    action = Action.LEFT_CLICK_AIR;

-                    break;

-                case RIGHT_CLICK_BLOCK:

-                    action = Action.RIGHT_CLICK_AIR;

-                    break;

-            }

-        }

-

-        if (itemInHand.getType() == Material.AIR || itemInHand.getAmount() == 0) {

-            itemInHand = null;

-        }

-

+package org.bukkit.craftbukkit.event;
+
+import net.minecraft.server.ChunkCoordinates;
+import net.minecraft.server.EntityChicken;
+import net.minecraft.server.EntityCow;
+import net.minecraft.server.EntityCreeper;
+import net.minecraft.server.EntityGhast;
+import net.minecraft.server.EntityGiantZombie;
+import net.minecraft.server.EntityHuman;
+import net.minecraft.server.EntityLiving;
+import net.minecraft.server.EntityPig;
+import net.minecraft.server.EntityPigZombie;
+import net.minecraft.server.EntitySheep;
+import net.minecraft.server.EntitySkeleton;
+import net.minecraft.server.EntitySlime;
+import net.minecraft.server.EntitySpider;
+import net.minecraft.server.EntitySquid;
+import net.minecraft.server.EntityZombie;
+import net.minecraft.server.Item;
+import net.minecraft.server.ItemStack;
+import net.minecraft.server.World;
+import net.minecraft.server.WorldServer;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event.Type;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+import org.bukkit.event.player.PlayerBucketFillEvent;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+public class CraftEventFactory {
+    private static boolean canBuild(CraftWorld world, Player player, int x, int z) {
+        WorldServer worldServer = world.getHandle();
+        int spawnSize = worldServer.x.spawnProtection;
+
+        if (spawnSize <= 0) return true;
+        if (player.isOp()) return true;
+
+        ChunkCoordinates chunkcoordinates = worldServer.l();
+
+        int distanceFromSpawn = (int) Math.max(Math.abs(x - chunkcoordinates.a), Math.abs(z - chunkcoordinates.c));
+        return distanceFromSpawn > spawnSize;
+    }
+
+    /**
+     * Block place methods
+     */
+    public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ, int type) {
+        return callBlockPlaceEvent(world, who, replacedBlockState, clickedX, clickedY, clickedZ, net.minecraft.server.Block.byId[type]);
+    }
+
+    public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ, net.minecraft.server.Block block) {
+        return callBlockPlaceEvent(world, who, replacedBlockState, clickedX, clickedY, clickedZ, new ItemStack(block));
+    }
+
+    public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ, ItemStack itemstack) {
+        CraftWorld craftWorld = ((WorldServer) world).getWorld();
+        CraftServer craftServer = ((WorldServer) world).getServer();
+
+        Player player = (who == null) ? null : (Player) who.getBukkitEntity();
+        CraftItemStack itemInHand = new CraftItemStack(itemstack);
+
+        Block blockClicked = craftWorld.getBlockAt(clickedX, clickedY, clickedZ);
+        Block placedBlock = replacedBlockState.getBlock();
+
+        boolean canBuild = canBuild(craftWorld, player, placedBlock.getX(), placedBlock.getZ());
+
+        BlockPlaceEvent event = new BlockPlaceEvent(placedBlock, replacedBlockState, blockClicked, itemInHand, player, canBuild);
+        craftServer.getPluginManager().callEvent(event);
+
+        return event;
+    }
+
+    /**
+     * Bucket methods
+     */
+    public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand) {
+        return (PlayerBucketEmptyEvent) getPlayerBucketEvent(Type.PLAYER_BUCKET_EMPTY, who, clickedX, clickedY, clickedZ, clickedFace, itemInHand, Item.BUCKET);
+    }
+
+    public static PlayerBucketFillEvent callPlayerBucketFillEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand, net.minecraft.server.Item bucket) {
+        return (PlayerBucketFillEvent) getPlayerBucketEvent(Type.PLAYER_BUCKET_FILL, who, clickedX, clickedY, clickedZ, clickedFace, itemInHand, bucket);
+    }
+
+    private static PlayerEvent getPlayerBucketEvent(Type type, EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemstack, net.minecraft.server.Item item) {
+        Player player = (who == null) ? null : (Player) who.getBukkitEntity();
+        CraftItemStack itemInHand = new CraftItemStack(new ItemStack(item));
+        Material bucket = Material.getMaterial(itemstack.id);
+
+        CraftWorld craftWorld = (CraftWorld) player.getWorld();
+        CraftServer craftServer = (CraftServer) player.getServer();
+
+        Block blockClicked = craftWorld.getBlockAt(clickedX, clickedY, clickedZ);
+        BlockFace blockFace = CraftBlock.notchToBlockFace(clickedFace);
+
+        PlayerEvent event = null;
+        if (type == Type.PLAYER_BUCKET_EMPTY) {
+            event = new PlayerBucketEmptyEvent(player, blockClicked, blockFace, bucket, itemInHand);
+            ((PlayerBucketEmptyEvent) event).setCancelled(!canBuild(craftWorld, player, clickedX, clickedZ));
+        } else if(type == Type.PLAYER_BUCKET_FILL) {
+            event = new PlayerBucketFillEvent(player, blockClicked, blockFace, bucket, itemInHand);
+            ((PlayerBucketFillEvent) event).setCancelled(!canBuild(craftWorld, player, clickedX, clickedZ));
+        }
+
+        craftServer.getPluginManager().callEvent(event);
+
+        return event;
+    }
+
+    /**
+     * Player Interact event
+     */
+    
+    public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack) {
+        if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {
+            throw new IllegalArgumentException();
+        }
+        return callPlayerInteractEvent(who, action, 0, 255, 0, 0, itemstack);
+    }
+    public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemstack) {
+        Player player = (who == null) ? null : (Player) who.getBukkitEntity();
+        CraftItemStack itemInHand = new CraftItemStack(itemstack);
+
+        CraftWorld craftWorld = (CraftWorld) player.getWorld();
+        CraftServer craftServer = (CraftServer) player.getServer();
+
+        Block blockClicked = craftWorld.getBlockAt(clickedX, clickedY, clickedZ);
+        BlockFace blockFace = CraftBlock.notchToBlockFace(clickedFace);
+
+        if (clickedY == 255) {
+            blockClicked = null;
+            switch (action) {
+                case LEFT_CLICK_BLOCK:
+                    action = Action.LEFT_CLICK_AIR;
+                    break;
+                case RIGHT_CLICK_BLOCK:
+                    action = Action.RIGHT_CLICK_AIR;
+                    break;
+            }
+        }
+
+        if (itemInHand.getType() == Material.AIR || itemInHand.getAmount() == 0) {
+            itemInHand = null;
+        }
+
         PlayerInteractEvent event = new PlayerInteractEvent(player, action, itemInHand, blockClicked, blockFace);
-        craftServer.getPluginManager().callEvent(event);

-

+        craftServer.getPluginManager().callEvent(event);
+
+        return event;
+    }
+
+    /**
+     * BlockDamageEvent
+     */
+    public static BlockDamageEvent callBlockDamageEvent(EntityHuman who, int x, int y, int z, ItemStack itemstack, boolean instaBreak) {
+        Player player = (who == null) ? null : (Player) who.getBukkitEntity();
+        CraftItemStack itemInHand = new CraftItemStack(itemstack);
+
+        CraftWorld craftWorld = (CraftWorld) player.getWorld();
+        CraftServer craftServer = (CraftServer) player.getServer();
+
+        Block blockClicked = craftWorld.getBlockAt(x, y, z);
+
+        BlockDamageEvent event = new BlockDamageEvent(player, blockClicked, itemInHand, instaBreak);
+        craftServer.getPluginManager().callEvent(event);
+
+        return event;
+    }
+
+    /**
+     * CreatureSpawnEvent
+     */
+    public static CreatureSpawnEvent callCreatureSpawnEvent(EntityLiving entityliving) {
+        org.bukkit.entity.Entity entity = entityliving.getBukkitEntity();
+        CraftServer craftServer = (CraftServer) entity.getServer();
+
+        CreatureType type = null;
+
+        if (entityliving instanceof EntityChicken) {
+            type = CreatureType.CHICKEN;
+        } else if (entityliving instanceof EntityCow) {
+            type = CreatureType.COW;
+        } else if (entityliving instanceof EntityCreeper) {
+            type = CreatureType.CREEPER;
+        } else if (entityliving instanceof EntityGhast) {
+            type = CreatureType.GHAST;
+        } else if (entityliving instanceof EntityGiantZombie) {
+            type = CreatureType.GIANT;
+        } else if (entityliving instanceof EntityPig) {
+            type = CreatureType.PIG;
+        } else if (entityliving instanceof EntityPigZombie) {
+            type = CreatureType.PIG_ZOMBIE;
+        } else if (entityliving instanceof EntitySheep) {
+            type = CreatureType.SHEEP;
+        } else if (entityliving instanceof EntitySkeleton) {
+            type = CreatureType.SKELETON;
+        } else if (entityliving instanceof EntitySpider) {
+            type = CreatureType.SPIDER;
+        } else if (entityliving instanceof EntityZombie) {
+            type = CreatureType.ZOMBIE;
+        } else if (entityliving instanceof EntitySlime) {
+            type = CreatureType.SLIME;
+        } else if (entityliving instanceof EntitySquid) {
+            type = CreatureType.SQUID;
+        }
+
+        CreatureSpawnEvent event = new CreatureSpawnEvent(entity, type, entity.getLocation());
+        craftServer.getPluginManager().callEvent(event);
         return event;
-    }

-

-    /**

-     * BlockDamageEvent

-     */

-    public static BlockDamageEvent callBlockDamageEvent(EntityHuman who, int x, int y, int z, ItemStack itemstack, boolean instaBreak) {

-        Player player = (who == null) ? null : (Player) who.getBukkitEntity();

-        CraftItemStack itemInHand = new CraftItemStack(itemstack);

-

-        CraftWorld craftWorld = (CraftWorld) player.getWorld();

-        CraftServer craftServer = (CraftServer) player.getServer();

-

-        Block blockClicked = craftWorld.getBlockAt(x, y, z);

-

-        BlockDamageEvent event = new BlockDamageEvent(player, blockClicked, itemInHand, instaBreak);

-        craftServer.getPluginManager().callEvent(event);

-

-        return event;

-    }

-

-    /**

-     * CreatureSpawnEvent

-     */

-    public static CreatureSpawnEvent callCreatureSpawnEvent(EntityLiving entityliving) {

-        org.bukkit.entity.Entity entity = entityliving.getBukkitEntity();

-        CraftServer craftServer = (CraftServer) entity.getServer();

-

-        CreatureType type = null;

-

-        if (entityliving instanceof EntityChicken) {

-            type = CreatureType.CHICKEN;

-        } else if (entityliving instanceof EntityCow) {

-            type = CreatureType.COW;

-        } else if (entityliving instanceof EntityCreeper) {

-            type = CreatureType.CREEPER;

-        } else if (entityliving instanceof EntityGhast) {

-            type = CreatureType.GHAST;

-        } else if (entityliving instanceof EntityGiantZombie) {

-            type = CreatureType.GIANT;

-        } else if (entityliving instanceof EntityPig) {

-            type = CreatureType.PIG;

-        } else if (entityliving instanceof EntityPigZombie) {

-            type = CreatureType.PIG_ZOMBIE;

-        } else if (entityliving instanceof EntitySheep) {

-            type = CreatureType.SHEEP;

-        } else if (entityliving instanceof EntitySkeleton) {

-            type = CreatureType.SKELETON;

-        } else if (entityliving instanceof EntitySpider) {

-            type = CreatureType.SPIDER;

-        } else if (entityliving instanceof EntityZombie) {

-            type = CreatureType.ZOMBIE;

-        } else if (entityliving instanceof EntitySlime) {

-            type = CreatureType.SLIME;

-        } else if (entityliving instanceof EntitySquid) {

-            type = CreatureType.SQUID;

-        }

-

-        CreatureSpawnEvent event = new CreatureSpawnEvent(entity, type, entity.getLocation());

-        craftServer.getPluginManager().callEvent(event);

-        return event;

-    }

-}

+    }
+}