Fixed translation issue and enderman not spawning when The End is generated. Fixes BUKKIT-1115

2 files changed, 1 insertions, 43 deletions

diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
index 47c7dcc3..3227a0a4 100644
--- a/src/main/java/net/minecraft/server/ItemBucket.java
+++ b/src/main/java/net/minecraft/server/ItemBucket.java
@@ -126,7 +126,7 @@ public class ItemBucket extends Item {
                         }
                         // CraftBukkit end
 
-                        if (world.worldProvider.e && this.a == Block.WATER.id) {
+                        if (world.worldProvider.d && this.a == Block.WATER.id) {
                             world.makeSound(d0 + 0.5D, d1 + 0.5D, d2 + 0.5D, "random.fizz", 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
 
                             for (int l = 0; l < 8; ++l) {
diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
deleted file mode 100644
index 52fc39e8..00000000
--- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package net.minecraft.server;
-
-public class WorldProviderTheEnd extends WorldProvider {
-
-    public WorldProviderTheEnd() {}
-
-    public void a() {
-        this.c = new WorldChunkManagerHell(BiomeBase.SKY, 0.5F, 0.0F);
-        this.dimension = 1;
-        this.e = false; // CraftBukkit
-    }
-
-    public IChunkProvider getChunkProvider() {
-        return new ChunkProviderTheEnd(this.a, this.a.getSeed());
-    }
-
-    public float a(long i, float f) {
-        return 0.0F;
-    }
-
-    public boolean c() {
-        return false;
-    }
-
-    public boolean d() {
-        return false;
-    }
-
-    public boolean canSpawn(int i, int j) {
-        int k = this.a.b(i, j);
-
-        return k == 0 ? false : Block.byId[k].material.isSolid();
-    }
-
-    public ChunkCoordinates e() {
-        return new ChunkCoordinates(100, 50, 0);
-    }
-
-    public int getSeaLevel() {
-        return 50;
-    }
-}