From 8b14c72a8d3537aae52aac69693489a1e9fe5559 Mon Sep 17 00:00:00 2001
From: Dinnerbone <dinnerbone@dinnerbone.com>
Date: Sun, 6 Feb 2011 20:50:57 +0000
Subject: Changes to reflect new Environment enum

---
 src/main/java/net/minecraft/server/PlayerInstance.java |  3 ---
 src/main/java/org/bukkit/craftbukkit/CraftServer.java  |  4 ++--
 src/main/java/org/bukkit/craftbukkit/CraftWorld.java   | 11 +++++++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/net/minecraft/server/PlayerInstance.java b/src/main/java/net/minecraft/server/PlayerInstance.java
index 6fe3b9c1..23443e03 100644
--- a/src/main/java/net/minecraft/server/PlayerInstance.java
+++ b/src/main/java/net/minecraft/server/PlayerInstance.java
@@ -162,9 +162,6 @@ class PlayerInstance {
                 } else {
                     this.a((Packet) (new Packet52MultiBlockChange(this.c, this.d, this.f, this.g, world))); // Craftbukkit
 
-                    System.out.println("MultiBlockChange called for world " + world.w);
-                    new Exception().printStackTrace();
-
                     for (i = 0; i < this.g; ++i) {
                         j = this.c * 16 + (this.g >> 12 & 15);
                         k = this.g & 255;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4bc77407..c84c5da0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -192,14 +192,14 @@ public final class CraftServer implements Server {
         return "CraftServer{" + "serverName=" + serverName + "serverVersion=" + serverVersion + "protocolVersion=" + protocolVersion + '}';
     }
 
-    public World createWorld(String name, boolean nether) {
+    public World createWorld(String name, World.Environment environment) {
         File folder = new File(name);
         
         if ((folder.exists()) && (!folder.isDirectory())) {
             throw new IllegalArgumentException("File exists with the name '" + name + "' and isn't a folder");
         }
 
-        WorldServer internal = new WorldServer(console, new File("."), name, nether ? -1 : 0);
+        WorldServer internal = new WorldServer(console, new File("."), name, environment == World.Environment.NETHER ? -1 : 0);
 
         internal.a(new WorldManager(console, internal));
         internal.k = 1;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 6f4e49bc..3ff5c7d6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -24,11 +24,18 @@ import org.bukkit.World;
 
 public class CraftWorld implements World {
     private final WorldServer world;
+    private final Environment environment;
 
     private static final Random rand = new Random();
 
     public CraftWorld(WorldServer world) {
         this.world = world;
+
+        if (world.q instanceof WorldProviderHell) {
+            environment = Environment.NETHER;
+        } else {
+            environment = Environment.NORMAL;
+        }
     }
 
     public Block getBlockAt(int x, int y, int z) {
@@ -212,6 +219,10 @@ public class CraftWorld implements World {
         world.e = time;
     }
 
+    public Environment getEnvironment() {
+        return environment;
+    }
+
     private final class ChunkCoordinate {
         public final int x;
         public final int z;
-- 
cgit v1.2.3