summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-05-31 10:12:54 +0200
committerMattes D <github@xoft.cz>2014-05-31 10:12:54 +0200
commit0b758946ace41563a1763f557298879c894e56c2 (patch)
tree8ba9e2a3703c34ae317bd157f559bc72813805d9 /src/Entities
parentFixed bindings for cCompositeChat:SetMessageType(). (diff)
parentReduced the number of cChunkData::CopyBlockTypes() tests, added progress. (diff)
downloadcuberite-0b758946ace41563a1763f557298879c894e56c2.tar
cuberite-0b758946ace41563a1763f557298879c894e56c2.tar.gz
cuberite-0b758946ace41563a1763f557298879c894e56c2.tar.bz2
cuberite-0b758946ace41563a1763f557298879c894e56c2.tar.lz
cuberite-0b758946ace41563a1763f557298879c894e56c2.tar.xz
cuberite-0b758946ace41563a1763f557298879c894e56c2.tar.zst
cuberite-0b758946ace41563a1763f557298879c894e56c2.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/FallingBlock.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Entities/FallingBlock.cpp b/src/Entities/FallingBlock.cpp
index beb58f207..111c5fa84 100644
--- a/src/Entities/FallingBlock.cpp
+++ b/src/Entities/FallingBlock.cpp
@@ -55,9 +55,8 @@ void cFallingBlock::Tick(float a_Dt, cChunk & a_Chunk)
return;
}
- int idx = a_Chunk.MakeIndexNoCheck(BlockX - a_Chunk.GetPosX() * cChunkDef::Width, BlockY, BlockZ - a_Chunk.GetPosZ() * cChunkDef::Width);
- BLOCKTYPE BlockBelow = a_Chunk.GetBlock(idx);
- NIBBLETYPE BelowMeta = a_Chunk.GetMeta(idx);
+ BLOCKTYPE BlockBelow = a_Chunk.GetBlock(BlockX - a_Chunk.GetPosX() * cChunkDef::Width, BlockY, BlockZ - a_Chunk.GetPosZ() * cChunkDef::Width);
+ NIBBLETYPE BelowMeta = a_Chunk.GetMeta(BlockX - a_Chunk.GetPosX() * cChunkDef::Width, BlockY, BlockZ - a_Chunk.GetPosZ() * cChunkDef::Width);
if (cSandSimulator::DoesBreakFallingThrough(BlockBelow, BelowMeta))
{
// Fallen onto a block that breaks this into pickups (e. g. half-slab)