1 files changed, 8 insertions, 14 deletions
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index 371ba17f..90683d73 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -4,7 +4,6 @@ import java.util.Random;
 
 // CraftBukkit start
 import org.bukkit.event.world.PortalCreateEvent;
-import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.Bukkit;
 // CraftBukkit end
 
@@ -225,9 +224,9 @@ public class PortalTravelAgent {
         boolean flag;
 
         // CraftBukkit start - portal create event
-        java.util.ArrayList<org.bukkit.block.Block> blocks = new java.util.ArrayList<org.bukkit.block.Block>();
+        java.util.Collection<org.bukkit.block.Block> blocks = new java.util.HashSet<org.bukkit.block.Block>();
         // Find out what blocks the portal is going to modify, duplicated from below
-        CraftWorld craftWorld = ((WorldServer) world).getWorld();
+        org.bukkit.World bworld = world.getWorld();
 
         if (d0 < 0.0D) {
             if (i1 < 70) {
@@ -246,10 +245,7 @@ public class PortalTravelAgent {
                         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);
-                        }
+                        blocks.add(bworld.getBlockAt(i3, l3, k3));
                     }
                 }
             }
@@ -261,16 +257,14 @@ public class PortalTravelAgent {
                     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);
-                    }
+                    blocks.add(bworld.getBlockAt(i3, l3, k3));
                 }
             }
         }
 
-        PortalCreateEvent event = new PortalCreateEvent(blocks, (org.bukkit.World) craftWorld);
+        PortalCreateEvent event = new PortalCreateEvent(blocks, bworld);
         Bukkit.getServer().getPluginManager().callEvent(event);
+
         if (event.isCancelled()) {
             return true;
         }
@@ -301,7 +295,7 @@ public class PortalTravelAgent {
         }
 
         for (l2 = 0; l2 < 4; ++l2) {
-            world.o = true;
+            world.suppressPhysics = true;
 
             for (k2 = 0; k2 < 4; ++k2) {
                 for (j3 = -1; j3 < 4; ++j3) {
@@ -313,7 +307,7 @@ public class PortalTravelAgent {
                 }
             }
 
-            world.o = false;
+            world.suppressPhysics = false;
 
             for (k2 = 0; k2 < 4; ++k2) {
                 for (j3 = -1; j3 < 4; ++j3) {