From bb16e6c5c16675e2523e1e375b24e0313d18a0a9 Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Fri, 25 Nov 2011 20:05:51 +0000
Subject: Fixed portal event reporting wrong from-world

---
 src/main/java/net/minecraft/server/ServerConfigurationManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index 1ff21bde..000ea0f0 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -306,11 +306,11 @@ public class ServerConfigurationManager {
     public void a(EntityPlayer entityplayer, int i) {
         // CraftBukkit start -- Replaced the standard handling of portals with a more customised method.
         int dimension = i;
-        WorldServer fromWorld = this.server.getWorldServer(dimension);
+        WorldServer fromWorld = this.server.getWorldServer(entityplayer.dimension);
         WorldServer toWorld = null;
         if (dimension < 10) {
             for (WorldServer world : this.server.worlds) {
-                if (world.dimension == i) {
+                if (world.dimension == dimension) {
                     toWorld = world;
                 }
             }
-- 
cgit v1.2.3