--- /home/matt/mc-dev-private//net/minecraft/server/BlockEnderPortal.java	2015-02-26 22:40:22.119608144 +0000
+++ src/main/java/net/minecraft/server/BlockEnderPortal.java	2015-02-26 22:40:22.119608144 +0000
@@ -3,6 +3,8 @@
 import java.util.List;
 import java.util.Random;
 
+import org.bukkit.event.entity.EntityPortalEnterEvent; // CraftBukkit
+
 public class BlockEnderPortal extends BlockContainer {
 
     protected BlockEnderPortal(Material material) {
@@ -36,6 +38,10 @@
 
     public void a(World world, BlockPosition blockposition, IBlockData iblockdata, Entity entity) {
         if (entity.vehicle == null && entity.passenger == null && !world.isClientSide) {
+            // CraftBukkit start - Entity in portal
+            EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), blockposition.getX(), blockposition.getY(), blockposition.getZ()));
+            world.getServer().getPluginManager().callEvent(event);
+            // CraftBukkit end
             entity.c(1);
         }