aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/BonusChestFeature.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/BonusChestFeature.cpp')
-rw-r--r--Minecraft.World/BonusChestFeature.cpp23
1 files changed, 14 insertions, 9 deletions
diff --git a/Minecraft.World/BonusChestFeature.cpp b/Minecraft.World/BonusChestFeature.cpp
index 6d083f54..86dc9725 100644
--- a/Minecraft.World/BonusChestFeature.cpp
+++ b/Minecraft.World/BonusChestFeature.cpp
@@ -24,18 +24,21 @@ bool BonusChestFeature::place(Level *level, Random *random, int x, int y, int z)
bool BonusChestFeature::place(Level *level, Random *random, int x, int y, int z, bool force)
{
- if( !force )
+ //Will only spawn a bonus chest if the world is new and has never been saved.
+ if (level->isNew)
{
- int t = 0;
- while (((t = level->getTile(x, y, z)) == 0 || t == Tile::leaves_Id) && y > 1)
+ if( !force )
+ {
+ int t = 0;
+ while (((t = level->getTile(x, y, z)) == 0 || t == Tile::leaves_Id) && y > 1)
y--;
- if (y < 1)
- {
- return false;
+ if (y < 1)
+ {
+ return false;
+ }
+ y++;
}
- y++;
- }
for (int i = 0; i < 4; i++)
{
@@ -59,7 +62,7 @@ bool BonusChestFeature::place(Level *level, Random *random, int x, int y, int z,
{
level->setTileAndData(x2, y2, z2, Tile::chest_Id, 0, Tile::UPDATE_CLIENTS);
shared_ptr<ChestTileEntity> chest = dynamic_pointer_cast<ChestTileEntity>(level->getTileEntity(x2, y2, z2));
- if (chest != NULL)
+ if (chest != nullptr)
{
WeighedTreasure::addChestItems(random, treasureList, chest, numRolls);
chest->isBonusChest = true; // 4J added
@@ -85,4 +88,6 @@ bool BonusChestFeature::place(Level *level, Random *random, int x, int y, int z,
}
return false;
+
+ }
}