summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-02-08 12:48:29 +0000
committerDinnerbone <dinnerbone@dinnerbone.com>2011-02-08 12:48:29 +0000
commitbcf9b5ca19a220800198cbb35319942d98bdc114 (patch)
tree2c6a46a075c02e2d03143e194e60b2e67876f851 /src/main/java/net/minecraft/server
parent6751433a8e106bfb4e1c6ab679f9cefc43ea8cdb (diff)
downloadcraftbukkit-bcf9b5ca19a220800198cbb35319942d98bdc114.tar
craftbukkit-bcf9b5ca19a220800198cbb35319942d98bdc114.tar.gz
craftbukkit-bcf9b5ca19a220800198cbb35319942d98bdc114.tar.lz
craftbukkit-bcf9b5ca19a220800198cbb35319942d98bdc114.tar.xz
craftbukkit-bcf9b5ca19a220800198cbb35319942d98bdc114.zip
Oops! This matters.
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/World.java2
-rw-r--r--src/main/java/net/minecraft/server/WorldServer.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 844b4471..be0b8e22 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -136,8 +136,6 @@ public class World implements IBlockAccess {
flag = true;
}
- // Craftbukkit start
-
this.q = (WorldProvider) object;
this.q.a(this);
this.G = this.a(this.t);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 7d6e8424..18ab1526 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -25,8 +25,8 @@ public class WorldServer extends World implements BlockChangeDelegate {
this.D = minecraftserver;
// CraftBukkit start
- this.world = new CraftWorld(this);
this.server = minecraftserver.server;
+ this.world = new CraftWorld(this);
this.manager = new PlayerManager(minecraftserver, this);
}