diff --git a/src/net/theprogrammersworld/herobrine/Herobrine.java b/src/net/theprogrammersworld/herobrine/Herobrine.java
index d823cfc..296cf27 100644
--- a/src/net/theprogrammersworld/herobrine/Herobrine.java
+++ b/src/net/theprogrammersworld/herobrine/Herobrine.java
@@ -256,31 +256,12 @@ public class Herobrine extends JavaPlugin implements Listener {
 		return mat.isSolid();
 	}
 
-	@SuppressWarnings("deprecation")
 	public static boolean isAllowedBlock(final Material mat) {
-		switch (mat.getId()) {
-			case 10: {
-				return false;
-			}
-			case 11: {
-				return false;
-			}
-			case 8: {
-				return false;
-			}
-			case 9: {
-				return false;
-			}
-			case 174: {
-				return false;
-			}
-			case 79: {
-				return false;
-			}
-			default: {
-				return !mat.isSolid();
-			}
-		}
+		if(mat == Material.WATER || mat == Material.STATIONARY_WATER || mat == Material.LAVA || mat == Material.STATIONARY_LAVA
+				|| mat == Material.ICE || mat == Material.PACKED_ICE)
+			return false;
+		else
+			return mat.isSolid();
 	}
 	
 	@EventHandler