The code now prevents conflicting enchantments.

cuberite · Oct 15, 2014 · fa6f8fb · fa6f8fb
1 parent 0cdd2b6
commit fa6f8fb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/ItemGrid.cpp b/src/ItemGrid.cpp
@@ -649,6 +649,7 @@ void cItemGrid::GenerateRandomLootWithBooks(const cLootProbab * a_LootProbabs, s
 			cEnchantments Enchantment = cEnchantments::GenerateEnchantmentFromVector(Enchantments, Noise.IntNoise2DInt(NumEnchantments, i));
 			CurrentLoot.m_Enchantments.Add(Enchantment);
 			cEnchantments::RemoveEnchantmentWeightFromVector(Enchantments, Enchantment);
+			cEnchantments::CheckEnchantmentConflictsFromVector(Enchantments, Enchantment);
 		}
 
 		for (size_t j = 0; j < a_CountLootProbabs; j++)