Merge branch 'master' into 1.8.8

This commit is contained in:
cpw committed 2015-11-23 22:39:49 -05:00
commit 84c3ef0f5c
9 files changed
+49 -132

No files matched your search

@@ -137,7 +137,7 @@ public class BiomeManager
public static ImmutableList<BiomeEntry> getBiomes(BiomeType type)
{
int idx = type.ordinal();
List<BiomeEntry> list = idx > biomes.length ? null : biomes[idx];
List<BiomeEntry> list = idx >= biomes.length ? null : biomes[idx];
return list != null ? ImmutableList.copyOf(list) : null;
}
@@ -169,7 +169,7 @@ public class BiomeManager
if (ret.ordinal() >= biomes.length)
{
biomes = Arrays.copyOf(biomes, ret.ordinal());
biomes = Arrays.copyOf(biomes, ret.ordinal() + 1);
}
return ret;