From 1c6c612f76d25909dd190e08dc9f32d3ab2c507a Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Mon, 14 Jul 2014 19:07:31 +0200
Subject: [PATCH 1/2] Reset meta to zero when the block explode.
---
src/ChunkMap.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 0a0a841cd..d25f6d64b 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1837,7 +1837,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
// Activate the TNT, with a random fuse between 10 to 30 game ticks
int FuseTime = 10 + m_World->GetTickRandomNumber(20);
m_World->SpawnPrimedTNT(a_BlockX + x + 0.5, a_BlockY + y + 0.5, a_BlockZ + z + 0.5, FuseTime);
- area.SetBlockType(bx + x, by + y, bz + z, E_BLOCK_AIR);
+ area.SetBlockTypeMeta(bx + x, by + y, bz + z, E_BLOCK_AIR, 0);
a_BlocksAffected.push_back(Vector3i(bx + x, by + y, bz + z));
break;
}
@@ -1854,14 +1854,14 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
case E_BLOCK_STATIONARY_WATER:
{
// Turn into simulated water:
- area.SetBlockType(bx + x, by + y, bz + z, E_BLOCK_WATER);
+ area.SetBlockTypeMeta(bx + x, by + y, bz + z, E_BLOCK_WATER, 0);
break;
}
case E_BLOCK_STATIONARY_LAVA:
{
// Turn into simulated lava:
- area.SetBlockType(bx + x, by + y, bz + z, E_BLOCK_LAVA);
+ area.SetBlockTypeMeta(bx + x, by + y, bz + z, E_BLOCK_LAVA, 0);
break;
}
@@ -1894,7 +1894,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
m_World->SpawnFallingBlock(bx + x, by + y + 5, bz + z, Block, area.GetBlockMeta(bx + x, by + y, bz + z));
}
- area.SetBlockType(bx + x, by + y, bz + z, E_BLOCK_AIR);
+ area.SetBlockTypeMeta(bx + x, by + y, bz + z, E_BLOCK_AIR, 0);
a_BlocksAffected.push_back(Vector3i(bx + x, by + y, bz + z));
break;
From 74b6bf01a9932b12cb4ce6588086bfb00bf305a0 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 15 Jul 2014 18:33:28 +0200
Subject: [PATCH 2/2] Derp.
---
src/ChunkMap.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index d25f6d64b..9bc3e5c49 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1854,14 +1854,14 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
case E_BLOCK_STATIONARY_WATER:
{
// Turn into simulated water:
- area.SetBlockTypeMeta(bx + x, by + y, bz + z, E_BLOCK_WATER, 0);
+ area.SetBlockType(bx + x, by + y, bz + z, E_BLOCK_WATER);
break;
}
case E_BLOCK_STATIONARY_LAVA:
{
// Turn into simulated lava:
- area.SetBlockTypeMeta(bx + x, by + y, bz + z, E_BLOCK_LAVA, 0);
+ area.SetBlockType(bx + x, by + y, bz + z, E_BLOCK_LAVA);
break;
}