summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2012-01-14 13:14:14 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2012-01-14 13:14:14 +0000
commitd5438c30b9fbf00d95a37ce8112732b98e738dca (patch)
tree91b9bf75d119ebb233230ddaacb1ccaf8f77438a
parent9da730c8e1b33b242a02e631d6433bca3d2fb8e7 (diff)
downloadcraftbukkit-d5438c30b9fbf00d95a37ce8112732b98e738dca.tar
craftbukkit-d5438c30b9fbf00d95a37ce8112732b98e738dca.tar.gz
craftbukkit-d5438c30b9fbf00d95a37ce8112732b98e738dca.tar.lz
craftbukkit-d5438c30b9fbf00d95a37ce8112732b98e738dca.tar.xz
craftbukkit-d5438c30b9fbf00d95a37ce8112732b98e738dca.zip
Fixed block.getBiome returning null in new 1.1 biomes. This fixes BUKKIT-496
-rw-r--r--src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index cad90ff3..aa43aa0e 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -256,6 +256,16 @@ public class CraftBlock implements Block {
return Biome.MUSHROOM_ISLAND;
} else if (base == BiomeBase.MUSHROOM_SHORE) {
return Biome.MUSHROOM_SHORE;
+ } else if (base == BiomeBase.BEACH) {
+ return Biome.BEACH;
+ } else if (base == BiomeBase.DESERT_HILLS) {
+ return Biome.DESERT_HILLS;
+ } else if (base == BiomeBase.FOREST_HILLS) {
+ return Biome.FOREST_HILLS;
+ } else if (base == BiomeBase.TAIGA_HILLS) {
+ return Biome.TAIGA_HILLS;
+ } else if (base == BiomeBase.SMALL_MOUNTAINS) {
+ return Biome.SMALL_MOUNTAINS;
}
return null;