summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-27 23:03:04 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-27 23:03:04 +0100
commit994e1d73355df62fb458936433f7478c9a0ef1ba (patch)
tree8a73f7de8f442ef26e5d43348f60efe37cfb6cbf
parentMerged master into redstonefixes (diff)
downloadcuberite-994e1d73355df62fb458936433f7478c9a0ef1ba.tar
cuberite-994e1d73355df62fb458936433f7478c9a0ef1ba.tar.gz
cuberite-994e1d73355df62fb458936433f7478c9a0ef1ba.tar.bz2
cuberite-994e1d73355df62fb458936433f7478c9a0ef1ba.tar.lz
cuberite-994e1d73355df62fb458936433f7478c9a0ef1ba.tar.xz
cuberite-994e1d73355df62fb458936433f7478c9a0ef1ba.tar.zst
cuberite-994e1d73355df62fb458936433f7478c9a0ef1ba.zip
-rw-r--r--src/ChunkMap.cpp4
-rw-r--r--src/World.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 611e9f24e..75346f9b2 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1655,12 +1655,12 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
default:
{
- if (m_World->GetTickRandomNumber(10) == 5)
+ if (m_World->GetTickRandomNumber(4) == 4) // Around 25% chance of pickups
{
cItems Drops;
cBlockHandler * Handler = BlockHandler(Block);
- Handler->ConvertToPickups(Drops, area.GetBlockMeta(bx + x, by + y, bz + z));
+ Handler->ConvertToPickups(Drops, area.GetBlockMeta(bx + x, by + y, bz + z)); // Stone becomes cobblestone, coal ore becomes coal, etc.
m_World->SpawnItemPickups(Drops, bx + x, by + y, bz + z);
}
area.SetBlockType(bx + x, by + y, bz + z, E_BLOCK_AIR);
diff --git a/src/World.cpp b/src/World.cpp
index a2ab545af..8ef4dc0f3 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1046,7 +1046,7 @@ void cWorld::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_Blo
return;
}
- // TODO: Add damage to entities, add support for pickups, and implement block hardiness
+ // TODO: Add damage to entities and implement block hardiness
Vector3d explosion_pos = Vector3d(a_BlockX, a_BlockY, a_BlockZ);
cVector3iArray BlocksAffected;
m_ChunkMap->DoExplosionAt(a_ExplosionSize, a_BlockX, a_BlockY, a_BlockZ, BlocksAffected);