diff options
| author | Jacob <jacobjm18@gmail.com> | 2017-01-19 17:21:05 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2017-01-19 17:21:05 +0100 |
| commit | 0f687c71827a52f19cee943fe46b8899576be92e (patch) | |
| tree | 830048214126f0f416826f125325b16b887b275a | |
| parent | Merge pull request #3553 from cuberite/RemoveChunkQueuedAssert (diff) | |
| download | cuberite-0f687c71827a52f19cee943fe46b8899576be92e.tar cuberite-0f687c71827a52f19cee943fe46b8899576be92e.tar.gz cuberite-0f687c71827a52f19cee943fe46b8899576be92e.tar.bz2 cuberite-0f687c71827a52f19cee943fe46b8899576be92e.tar.lz cuberite-0f687c71827a52f19cee943fe46b8899576be92e.tar.xz cuberite-0f687c71827a52f19cee943fe46b8899576be92e.tar.zst cuberite-0f687c71827a52f19cee943fe46b8899576be92e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | src/Items/ItemBigFlower.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 53df4fc03..6d2c8edfd 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,5 +1,6 @@ Many people have contributed to Cuberite, and this list attempts to broadcast at least some of them. +Altenius BasedDoge (Donated AlchemistVillage prefabs) bearbin (Alexander Harkness) beeduck diff --git a/src/Items/ItemBigFlower.h b/src/Items/ItemBigFlower.h index a052485e4..f7171f2bc 100644 --- a/src/Items/ItemBigFlower.h +++ b/src/Items/ItemBigFlower.h @@ -35,12 +35,11 @@ public: ) override { // 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; } - 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); if (a_BlockY < cChunkDef::Height - 1) { |