flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed placing of double tall flowers and an inconsistency with vanilla (#3541)

This commit is contained in:
Jacob 2017-01-19 11:21:05 -05:00 committed by Mattes D
parent 35ca578f44
commit 0f687c7182
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1,5 +1,6 @@
Many people have contributed to Cuberite, and this list attempts to broadcast at least some of them. Many people have contributed to Cuberite, and this list attempts to broadcast at least some of them.
Altenius
BasedDoge (Donated AlchemistVillage prefabs) BasedDoge (Donated AlchemistVillage prefabs)
bearbin (Alexander Harkness) bearbin (Alexander Harkness)
beeduck beeduck

3
src/Items/ItemBigFlower.h
View File

@ -35,12 +35,11 @@ public:
) override ) override
{ {
// Can only be placed on the floor: // Can only be placed on the floor:
if (a_BlockFace != BLOCK_FACE_TOP) if ((a_BlockY < 0) || (a_World.GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ) == E_BLOCK_AIR))
{ {
return false; return false;
} }
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
a_BlocksToSet.emplace_back(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_BIG_FLOWER, a_EquippedItem.m_ItemDamage & 0x07); a_BlocksToSet.emplace_back(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_BIG_FLOWER, a_EquippedItem.m_ItemDamage & 0x07);
if (a_BlockY < cChunkDef::Height - 1) if (a_BlockY < cChunkDef::Height - 1)
{ {