From d5438c30b9fbf00d95a37ce8112732b98e738dca Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Sat, 14 Jan 2012 13:14:14 +0000
Subject: [PATCH] Fixed block.getBiome returning null in new 1.1 biomes. This
 fixes BUKKIT-496

---
 .../java/org/bukkit/craftbukkit/block/CraftBlock.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index cad90ff30b..aa43aa0e29 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;