summaryrefslogtreecommitdiffstats
path: root/src/Items
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-01-26 16:06:25 +0100
committerTycho <work.tycho+git@gmail.com>2014-01-26 16:06:25 +0100
commita13d009a30988037707ff79aab81be4acd8b6a77 (patch)
tree16840b360333f5c43ab15f99eac37b7985f265fb /src/Items
parentMerge branch 'master' into GeneratingBenchmark2 (diff)
downloadcuberite-a13d009a30988037707ff79aab81be4acd8b6a77.tar
cuberite-a13d009a30988037707ff79aab81be4acd8b6a77.tar.gz
cuberite-a13d009a30988037707ff79aab81be4acd8b6a77.tar.bz2
cuberite-a13d009a30988037707ff79aab81be4acd8b6a77.tar.lz
cuberite-a13d009a30988037707ff79aab81be4acd8b6a77.tar.xz
cuberite-a13d009a30988037707ff79aab81be4acd8b6a77.tar.zst
cuberite-a13d009a30988037707ff79aab81be4acd8b6a77.zip
Diffstat (limited to '')
-rw-r--r--src/Items/ItemDoor.h6
-rw-r--r--src/Items/ItemHandler.cpp3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/Items/ItemDoor.h b/src/Items/ItemDoor.h
index 72ea0beed..d5c1d887a 100644
--- a/src/Items/ItemDoor.h
+++ b/src/Items/ItemDoor.h
@@ -31,12 +31,14 @@ public:
) override
{
a_BlockType = (m_ItemType == E_ITEM_WOODEN_DOOR) ? E_BLOCK_WOODEN_DOOR : E_BLOCK_IRON_DOOR;
- return BlockHandler(a_BlockType)->GetPlacementBlockTypeMeta(
- a_World, a_Player,
+ cChunkInterface ChunkInterface(a_World->GetChunkMap());
+ bool Meta = BlockHandler(a_BlockType)->GetPlacementBlockTypeMeta(
+ &ChunkInterface, a_Player,
a_BlockX, a_BlockY, a_BlockZ, a_BlockFace,
a_CursorX, a_CursorY, a_CursorZ,
a_BlockType, a_BlockMeta
);
+ return Meta;
}
} ;
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index 250e21dc4..32f9cb3b9 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -465,8 +465,9 @@ bool cItemHandler::GetPlacementBlockTypeMeta(
}
cBlockHandler * BlockH = BlockHandler(m_ItemType);
+ cChunkInterface ChunkInterface(a_World->GetChunkMap());
return BlockH->GetPlacementBlockTypeMeta(
- a_World, a_Player,
+ &ChunkInterface, a_Player,
a_BlockX, a_BlockY, a_BlockZ, a_BlockFace,
a_CursorX, a_CursorY, a_CursorZ,
a_BlockType, a_BlockMeta