diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
new file mode 100644
index 0000000000..dec1e9dedd
--- /dev/null
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -0,0 +1,150 @@
+package net.minecraft.server;
+
+import java.util.Random;
+
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.event.entity.EntityPortalEnterEvent;
+
+public class BlockPortal extends BlockBreakable {
+
+    public BlockPortal(int i, int j) {
+        super(i, j, Material.PORTAL, false);
+    }
+
+    public AxisAlignedBB d(World world, int i, int j, int k) {
+        return null;
+    }
+
+    public void a(IBlockAccess iblockaccess, int i, int j, int k) {
+        float f;
+        float f1;
+
+        if (iblockaccess.getTypeId(i - 1, j, k) != this.id && iblockaccess.getTypeId(i + 1, j, k) != this.id) {
+            f = 0.125F;
+            f1 = 0.5F;
+            this.a(0.5F - f, 0.0F, 0.5F - f1, 0.5F + f, 1.0F, 0.5F + f1);
+        } else {
+            f = 0.5F;
+            f1 = 0.125F;
+            this.a(0.5F - f, 0.0F, 0.5F - f1, 0.5F + f, 1.0F, 0.5F + f1);
+        }
+    }
+
+    public boolean a() {
+        return false;
+    }
+
+    public boolean b() {
+        return false;
+    }
+
+    public boolean a_(World world, int i, int j, int k) {
+        byte b0 = 0;
+        byte b1 = 0;
+
+        if (world.getTypeId(i - 1, j, k) == Block.OBSIDIAN.id || world.getTypeId(i + 1, j, k) == Block.OBSIDIAN.id) {
+            b0 = 1;
+        }
+
+        if (world.getTypeId(i, j, k - 1) == Block.OBSIDIAN.id || world.getTypeId(i, j, k + 1) == Block.OBSIDIAN.id) {
+            b1 = 1;
+        }
+
+        if (b0 == b1) {
+            return false;
+        } else {
+            if (world.getTypeId(i - b0, j, k - b1) == 0) {
+                i -= b0;
+                k -= b1;
+            }
+
+            int l;
+            int i1;
+
+            for (l = -1; l <= 2; ++l) {
+                for (i1 = -1; i1 <= 3; ++i1) {
+                    boolean flag = l == -1 || l == 2 || i1 == -1 || i1 == 3;
+
+                    if (l != -1 && l != 2 || i1 != -1 && i1 != 3) {
+                        int j1 = world.getTypeId(i + b0 * l, j + i1, k + b1 * l);
+
+                        if (flag) {
+                            if (j1 != Block.OBSIDIAN.id) {
+                                return false;
+                            }
+                        } else if (j1 != 0 && j1 != Block.FIRE.id) {
+                            return false;
+                        }
+                    }
+                }
+            }
+
+            world.o = true;
+
+            for (l = 0; l < 2; ++l) {
+                for (i1 = 0; i1 < 3; ++i1) {
+                    world.setTypeId(i + b0 * l, j + i1, k + b1 * l, Block.PORTAL.id);
+                }
+            }
+
+            world.o = false;
+            return true;
+        }
+    }
+
+    public void doPhysics(World world, int i, int j, int k, int l) {
+        byte b0 = 0;
+        byte b1 = 1;
+
+        if (world.getTypeId(i - 1, j, k) == this.id || world.getTypeId(i + 1, j, k) == this.id) {
+            b0 = 1;
+            b1 = 0;
+        }
+
+        int i1;
+
+        for (i1 = j; world.getTypeId(i, i1 - 1, k) == this.id; --i1) {
+            ;
+        }
+
+        if (world.getTypeId(i, i1 - 1, k) != Block.OBSIDIAN.id) {
+            world.setTypeId(i, j, k, 0);
+        } else {
+            int j1;
+
+            for (j1 = 1; j1 < 4 && world.getTypeId(i, i1 + j1, k) == this.id; ++j1) {
+                ;
+            }
+
+            if (j1 == 3 && world.getTypeId(i, i1 + j1, k) == Block.OBSIDIAN.id) {
+                boolean flag = world.getTypeId(i - 1, j, k) == this.id || world.getTypeId(i + 1, j, k) == this.id;
+                boolean flag1 = world.getTypeId(i, j, k - 1) == this.id || world.getTypeId(i, j, k + 1) == this.id;
+
+                if (flag && flag1) {
+                    world.setTypeId(i, j, k, 0);
+                } else if ((world.getTypeId(i + b0, j, k + b1) != Block.OBSIDIAN.id || world.getTypeId(i - b0, j, k - b1) != this.id) && (world.getTypeId(i - b0, j, k - b1) != Block.OBSIDIAN.id || world.getTypeId(i + b0, j, k + b1) != this.id)) {
+                    world.setTypeId(i, j, k, 0);
+                }
+            } else {
+                world.setTypeId(i, j, k, 0);
+            }
+        }
+    }
+
+    public int a(Random random) {
+        return 0;
+    }
+
+    public void a(World world, int i, int j, int k, Entity entity) {
+        if (entity.vehicle == null && entity.passenger == null) {
+            // CraftBukkit start - Entity in portal
+            CraftWorld craftWorld = ((WorldServer) world).getWorld();
+            EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(craftWorld,i, j, k));
+            Bukkit.getServer().getPluginManager().callEvent(event);
+            // CraftBukkit end
+            entity.O();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
new file mode 100644
index 0000000000..85c77400d8
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -0,0 +1,328 @@
+package net.minecraft.server;
+
+import java.util.Random;
+
+// CraftBukkit start
+import org.bukkit.event.world.PortalCreateEvent;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.Bukkit;
+// CraftBukkit end
+
+public class PortalTravelAgent {
+
+    private Random a = new Random();
+
+    public PortalTravelAgent() {}
+
+    public void a(World world, Entity entity) {
+        if (!this.b(world, entity)) {
+            this.c(world, entity);
+            this.b(world, entity);
+        }
+    }
+
+    public boolean b(World world, Entity entity) {
+        short short1 = 128;
+        double d0 = -1.0D;
+        int i = 0;
+        int j = 0;
+        int k = 0;
+        int l = MathHelper.floor(entity.locX);
+        int i1 = MathHelper.floor(entity.locZ);
+
+        double d1;
+
+        for (int j1 = l - short1; j1 <= l + short1; ++j1) {
+            double d2 = (double) j1 + 0.5D - entity.locX;
+
+            for (int k1 = i1 - short1; k1 <= i1 + short1; ++k1) {
+                double d3 = (double) k1 + 0.5D - entity.locZ;
+
+                for (int l1 = 127; l1 >= 0; --l1) {
+                    if (world.getTypeId(j1, l1, k1) == Block.PORTAL.id) {
+                        while (world.getTypeId(j1, l1 - 1, k1) == Block.PORTAL.id) {
+                            --l1;
+                        }
+
+                        d1 = (double) l1 + 0.5D - entity.locY;
+                        double d4 = d2 * d2 + d1 * d1 + d3 * d3;
+
+                        if (d0 < 0.0D || d4 < d0) {
+                            d0 = d4;
+                            i = j1;
+                            j = l1;
+                            k = k1;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (d0 >= 0.0D) {
+            double d5 = (double) i + 0.5D;
+            double d6 = (double) j + 0.5D;
+
+            d1 = (double) k + 0.5D;
+            if (world.getTypeId(i - 1, j, k) == Block.PORTAL.id) {
+                d5 -= 0.5D;
+            }
+
+            if (world.getTypeId(i + 1, j, k) == Block.PORTAL.id) {
+                d5 += 0.5D;
+            }
+
+            if (world.getTypeId(i, j, k - 1) == Block.PORTAL.id) {
+                d1 -= 0.5D;
+            }
+
+            if (world.getTypeId(i, j, k + 1) == Block.PORTAL.id) {
+                d1 += 0.5D;
+            }
+
+            entity.setPositionRotation(d5, d6, d1, entity.yaw, 0.0F);
+            entity.motX = entity.motY = entity.motZ = 0.0D;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean c(World world, Entity entity) {
+        byte b0 = 16;
+        double d0 = -1.0D;
+        int i = MathHelper.floor(entity.locX);
+        int j = MathHelper.floor(entity.locY);
+        int k = MathHelper.floor(entity.locZ);
+        int l = i;
+        int i1 = j;
+        int j1 = k;
+        int k1 = 0;
+        int l1 = this.a.nextInt(4);
+
+        int i2;
+        double d1;
+        int j2;
+        double d2;
+        int k2;
+        int l2;
+        int i3;
+        int j3;
+        int k3;
+        int l3;
+        int i4;
+        int j4;
+        int k4;
+        double d3;
+        double d4;
+
+        for (i2 = i - b0; i2 <= i + b0; ++i2) {
+            d1 = (double) i2 + 0.5D - entity.locX;
+
+            for (j2 = k - b0; j2 <= k + b0; ++j2) {
+                d2 = (double) j2 + 0.5D - entity.locZ;
+
+                label271:
+                for (l2 = 127; l2 >= 0; --l2) {
+                    if (world.isEmpty(i2, l2, j2)) {
+                        while (l2 > 0 && world.isEmpty(i2, l2 - 1, j2)) {
+                            --l2;
+                        }
+
+                        for (k2 = l1; k2 < l1 + 4; ++k2) {
+                            j3 = k2 % 2;
+                            i3 = 1 - j3;
+                            if (k2 % 4 >= 2) {
+                                j3 = -j3;
+                                i3 = -i3;
+                            }
+
+                            for (l3 = 0; l3 < 3; ++l3) {
+                                for (k3 = 0; k3 < 4; ++k3) {
+                                    for (j4 = -1; j4 < 4; ++j4) {
+                                        i4 = i2 + (k3 - 1) * j3 + l3 * i3;
+                                        k4 = l2 + j4;
+                                        int l4 = j2 + (k3 - 1) * i3 - l3 * j3;
+
+                                        if (j4 < 0 && !world.getMaterial(i4, k4, l4).isBuildable() || j4 >= 0 && !world.isEmpty(i4, k4, l4)) {
+                                            continue label271;
+                                        }
+                                    }
+                                }
+                            }
+
+                            d3 = (double) l2 + 0.5D - entity.locY;
+                            d4 = d1 * d1 + d3 * d3 + d2 * d2;
+                            if (d0 < 0.0D || d4 < d0) {
+                                d0 = d4;
+                                l = i2;
+                                i1 = l2;
+                                j1 = j2;
+                                k1 = k2 % 4;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (d0 < 0.0D) {
+            for (i2 = i - b0; i2 <= i + b0; ++i2) {
+                d1 = (double) i2 + 0.5D - entity.locX;
+
+                for (j2 = k - b0; j2 <= k + b0; ++j2) {
+                    d2 = (double) j2 + 0.5D - entity.locZ;
+
+                    label219:
+                    for (l2 = 127; l2 >= 0; --l2) {
+                        if (world.isEmpty(i2, l2, j2)) {
+                            while (world.isEmpty(i2, l2 - 1, j2)) {
+                                --l2;
+                            }
+
+                            for (k2 = l1; k2 < l1 + 2; ++k2) {
+                                j3 = k2 % 2;
+                                i3 = 1 - j3;
+
+                                for (l3 = 0; l3 < 4; ++l3) {
+                                    for (k3 = -1; k3 < 4; ++k3) {
+                                        j4 = i2 + (l3 - 1) * j3;
+                                        i4 = l2 + k3;
+                                        k4 = j2 + (l3 - 1) * i3;
+                                        if (k3 < 0 && !world.getMaterial(j4, i4, k4).isBuildable() || k3 >= 0 && !world.isEmpty(j4, i4, k4)) {
+                                            continue label219;
+                                        }
+                                    }
+                                }
+
+                                d3 = (double) l2 + 0.5D - entity.locY;
+                                d4 = d1 * d1 + d3 * d3 + d2 * d2;
+                                if (d0 < 0.0D || d4 < d0) {
+                                    d0 = d4;
+                                    l = i2;
+                                    i1 = l2;
+                                    j1 = j2;
+                                    k1 = k2 % 2;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        int i5 = l;
+        int j5 = i1;
+
+        j2 = j1;
+        int k5 = k1 % 2;
+        int l5 = 1 - k5;
+
+        if (k1 % 4 >= 2) {
+            k5 = -k5;
+            l5 = -l5;
+        }
+
+        boolean flag;
+
+        // CraftBukkit start - portal create event
+        java.util.ArrayList<org.bukkit.block.Block> blocks = new java.util.ArrayList<org.bukkit.block.Block>();
+        //Find out what blocks the portal is going to modify, duplicated from below
+        CraftWorld craftWorld = ((WorldServer) world).getWorld();
+
+        if (d0 < 0.0D) {
+            if (i1 < 70) {
+                i1 = 70;
+            }
+
+            if (i1 > 118) {
+                i1 = 118;
+            }
+
+            j5 = i1;
+
+            for (l2 = -1; l2 <= 1; ++l2) {
+                for (k2 = 1; k2 < 3; ++k2) {
+                    for (j3 = -1; j3 < 3; ++j3) {
+                        i3 = i5 + (k2 - 1) * k5 + l2 * l5;
+                        l3 = j5 + j3;
+                        k3 = j2 + (k2 - 1) * l5 - l2 * k5;
+                        org.bukkit.block.Block b = craftWorld.getBlockAt(i3, l3, k3);
+                        if (!blocks.contains(b)) {
+                            blocks.add(b);
+                        }
+                    }
+                }
+            }
+        }
+
+        for (l2 = 0; l2 < 4; ++l2) {
+            for (k2 = 0; k2 < 4; ++k2) {
+                for (j3 = -1; j3 < 4; ++j3) {
+                    i3 = i5 + (k2 - 1) * k5;
+                    l3 = j5 + j3;
+                    k3 = j2 + (k2 - 1) * l5;
+                    org.bukkit.block.Block b = craftWorld.getBlockAt(i3, l3, k3);
+                    if (!blocks.contains(b)) {
+                        blocks.add(b);
+                    }
+                }
+            }
+        }
+
+        PortalCreateEvent event = new PortalCreateEvent(blocks,(org.bukkit.World)craftWorld);
+        Bukkit.getServer().getPluginManager().callEvent(event);
+        if(event.isCancelled()) return true;
+        // CraftBukkit end
+
+        if (d0 < 0.0D) {
+            if (i1 < 70) {
+                i1 = 70;
+            }
+
+            if (i1 > 118) {
+                i1 = 118;
+            }
+
+            j5 = i1;
+
+            for (l2 = -1; l2 <= 1; ++l2) {
+                for (k2 = 1; k2 < 3; ++k2) {
+                    for (j3 = -1; j3 < 3; ++j3) {
+                        i3 = i5 + (k2 - 1) * k5 + l2 * l5;
+                        l3 = j5 + j3;
+                        k3 = j2 + (k2 - 1) * l5 - l2 * k5;
+                        flag = j3 < 0;
+                        world.setTypeId(i3, l3, k3, flag ? Block.OBSIDIAN.id : 0);
+                    }
+                }
+            }
+        }
+
+        for (l2 = 0; l2 < 4; ++l2) {
+            world.o = true;
+
+            for (k2 = 0; k2 < 4; ++k2) {
+                for (j3 = -1; j3 < 4; ++j3) {
+                    i3 = i5 + (k2 - 1) * k5;
+                    l3 = j5 + j3;
+                    k3 = j2 + (k2 - 1) * l5;
+                    flag = k2 == 0 || k2 == 3 || j3 == -1 || j3 == 3;
+                    world.setTypeId(i3, l3, k3, flag ? Block.OBSIDIAN.id : Block.PORTAL.id);
+                }
+            }
+
+            world.o = false;
+
+            for (k2 = 0; k2 < 4; ++k2) {
+                for (j3 = -1; j3 < 4; ++j3) {
+                    i3 = i5 + (k2 - 1) * k5;
+                    l3 = j5 + j3;
+                    k3 = j2 + (k2 - 1) * l5;
+                    world.applyPhysics(i3, l3, k3, world.getTypeId(i3, l3, k3));
+                }
+            }
+        }
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index efcea11214..72edfca410 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -18,10 +18,12 @@ import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.command.ColouredConsoleSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.Bukkit;
 // CraftBukkit end
 
 public class ServerConfigurationManager {
@@ -268,6 +270,21 @@ public class ServerConfigurationManager {
         }
 
         // CraftBukkit start
+        CraftWorld oldCraftWorld =  worldserver.getWorld();
+        CraftWorld newCraftWorld =  this.server.a(b0).getWorld();
+        Location startLocation = new Location(oldCraftWorld, entityplayer.locX, entityplayer.locY, entityplayer.locZ);
+        Location endLocation;
+        if (b0 == -1) {
+            endLocation = new Location(newCraftWorld, entityplayer.locX / 8.0D, entityplayer.locY, entityplayer.locZ / 8.0D,entityplayer.yaw,entityplayer.pitch);
+        } else {
+            endLocation = new Location(newCraftWorld, entityplayer.locX * 8.0D, entityplayer.locY, entityplayer.locZ * 8.0D,entityplayer.yaw,entityplayer.pitch);
+        }
+        PlayerPortalEvent event = new PlayerPortalEvent((Player)entityplayer.getBukkitEntity(),startLocation,endLocation);
+        Bukkit.getServer().getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            return entityplayer;
+        }
+
         // entityplayer.dimension = b0;
         WorldServer worldserver1 = this.server.a(b0);
 
@@ -297,9 +314,12 @@ public class ServerConfigurationManager {
             // worldserver1.addEntity(entityplayer); // CraftBukkit
             entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch);
             worldserver1.entityJoinedWorld(entityplayer, false);
-            worldserver1.chunkProviderServer.a = true;
-            (new PortalTravelAgent()).a(worldserver1, entityplayer);
-            worldserver1.chunkProviderServer.a = false;
+            // CraftBukkit start - added conditional
+            if (event.useTravelAgent()) {
+                worldserver1.chunkProviderServer.a = true;
+                (new PortalTravelAgent()).a(worldserver1, entityplayer);
+                worldserver1.chunkProviderServer.a = false;
+            } // CraftBukkit end
         }
         /* CraftBukkit start
         this.a(entityplayer);