flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Minor typo fixes

Browse Source 
* Also DeMorgan'd Emerald ore condition
This commit is contained in:
Tiger Wang 2020-08-19 21:00:17 +01:00
parent b230b547b6
commit 6617d43983
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Server/Plugins/APIDump/APIDesc.lua
View File

@ -13662,7 +13662,7 @@ end
Type = "boolean", Type = "boolean",
}, },
}, },
Notes = "Returns true if the biome is type of Mesa (mutations of the Mesa biome)." Notes = "Returns true if the biome is a type of Mesa (mutations of the Mesa biome)."
}, },
IsValidBlock = IsValidBlock =
{ {

34
src/Generating/FinishGen.cpp
View File

@ -1751,19 +1751,21 @@ void cFinishGenOreNests::GenerateOre(
// It does so by making a random XYZ walk and adding ore along the way in cuboids of different (random) sizes // It does so by making a random XYZ walk and adding ore along the way in cuboids of different (random) sizes
// Only "terraformable" blocks get replaced with ore, all other blocks stay (so the nest can actually be smaller than specified). // Only "terraformable" blocks get replaced with ore, all other blocks stay (so the nest can actually be smaller than specified).
// If there is a try to generate Emerald ores in chunk where there's no mountains biome abort // If there is an attempt to generate Emerald ores in a chunk with no mountains biome abort
// There are just four points sampled to avoid searching the whole 16 * 16 Blocks // There are just four points sampled to avoid searching all 16 * 16 blocks:
if (a_OreType == E_BLOCK_EMERALD_ORE) if (a_OreType == E_BLOCK_EMERALD_ORE)
{ {
auto BiomeSampleOne = a_ChunkDesc.GetBiome( 4, 4); const auto BiomeSampleOne = a_ChunkDesc.GetBiome( 4, 4);
auto BiomeSampleTwo = a_ChunkDesc.GetBiome( 4, 12); const auto BiomeSampleTwo = a_ChunkDesc.GetBiome( 4, 12);
auto BiomeSampleThree = a_ChunkDesc.GetBiome(12, 4); const auto BiomeSampleThree = a_ChunkDesc.GetBiome(12, 4);
auto BiomeSampleFour = a_ChunkDesc.GetBiome(12, 12); const auto BiomeSampleFour = a_ChunkDesc.GetBiome(12, 12);
if (! (IsBiomeMountain(BiomeSampleOne) || if (
(IsBiomeMountain(BiomeSampleTwo)) || !IsBiomeMountain(BiomeSampleOne) &&
(IsBiomeMountain(BiomeSampleThree)) || !IsBiomeMountain(BiomeSampleTwo) &&
(IsBiomeMountain(BiomeSampleFour)))) !IsBiomeMountain(BiomeSampleThree) &&
!IsBiomeMountain(BiomeSampleFour)
)
{ {
return; return;
} }
@ -1773,20 +1775,20 @@ void cFinishGenOreNests::GenerateOre(
// https://minecraft.gamepedia.com/Gold_Ore // https://minecraft.gamepedia.com/Gold_Ore
if (a_OreType == E_BLOCK_GOLD_ORE) if (a_OreType == E_BLOCK_GOLD_ORE)
{ {
auto BiomeSampleOne = a_ChunkDesc.GetBiome( 4, 4); const auto BiomeSampleOne = a_ChunkDesc.GetBiome( 4, 4);
auto BiomeSampleTwo = a_ChunkDesc.GetBiome( 4, 12); const auto BiomeSampleTwo = a_ChunkDesc.GetBiome( 4, 12);
auto BiomeSampleThree = a_ChunkDesc.GetBiome(12, 4); const auto BiomeSampleThree = a_ChunkDesc.GetBiome(12, 4);
auto BiomeSampleFour = a_ChunkDesc.GetBiome(12, 12); const auto BiomeSampleFour = a_ChunkDesc.GetBiome(12, 12);
if ( if (
IsBiomeMesa(BiomeSampleOne) || IsBiomeMesa(BiomeSampleOne) ||
IsBiomeMesa(BiomeSampleTwo) || IsBiomeMesa(BiomeSampleTwo) ||
IsBiomeMesa(BiomeSampleThree) || IsBiomeMesa(BiomeSampleThree) ||
IsBiomeMesa(BiomeSampleFour) IsBiomeMesa(BiomeSampleFour)
) )
{ {
a_MaxHeight = 76; a_MaxHeight = 76;
a_NumNests = 22; // 2 time default + 20 times mesa bonus a_NumNests = 22; // 2 times default + 20 times mesa bonus
} }
} }

4
src/WorldStorage/NamespaceSerializer.cpp
View File

@ -258,14 +258,14 @@ namespace NamespaceSerializer
const auto NamespaceIndex = ID.find(':'); const auto NamespaceIndex = ID.find(':');
if (NamespaceIndex == std::string_view::npos) if (NamespaceIndex == std::string_view::npos)
{ {
// No explicit namespace default to the Minecraft namespace: // No explicit namespace defaults to the Minecraft namespace:
return { Namespace::Minecraft, ID }; return { Namespace::Minecraft, ID };
} }
const auto Namespace = ID.substr(0, NamespaceIndex); const auto Namespace = ID.substr(0, NamespaceIndex);
if (Namespace == "minecraft") if (Namespace == "minecraft")
{ {
// An unprefixed ID in the vanilla Minecraft namespace // An unprefixed ID in the vanilla Minecraft namespace.
const auto Value = ID.substr(NamespaceIndex + 1); const auto Value = ID.substr(NamespaceIndex + 1);
return { Namespace::Minecraft, Value }; return { Namespace::Minecraft, Value };