diff options
| author | Mattes D <github@xoft.cz> | 2017-06-15 15:32:33 +0200 |
|---|---|---|
| committer | Lukas Pioch <lukas@zgow.de> | 2017-06-16 14:11:28 +0200 |
| commit | 0dd1cd750bb51403d85a226a97a5ad93eb99b144 (patch) | |
| tree | 8c7a4e8580a780e1ed27f4141c32de7ec3087710 /src/BlockEntities/DispenserEntity.cpp | |
| parent | Choose # of threads based on system info (#3644) (diff) | |
| download | cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.gz cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.bz2 cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.lz cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.xz cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.zst cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.zip | |
Diffstat (limited to 'src/BlockEntities/DispenserEntity.cpp')
| -rw-r--r-- | src/BlockEntities/DispenserEntity.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp index 78ce81e5b..66311a518 100644 --- a/src/BlockEntities/DispenserEntity.cpp +++ b/src/BlockEntities/DispenserEntity.cpp @@ -13,9 +13,10 @@ -cDispenserEntity::cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) : - super(E_BLOCK_DISPENSER, a_BlockX, a_BlockY, a_BlockZ, a_World) +cDispenserEntity::cDispenserEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World): + Super(a_BlockType, a_BlockMeta, a_BlockX, a_BlockY, a_BlockZ, a_World) { + ASSERT(a_BlockType == E_BLOCK_DISPENSER); } @@ -309,9 +310,9 @@ Vector3d cDispenserEntity::GetShootVector(NIBBLETYPE a_Meta) -bool cDispenserEntity::ScoopUpLiquid(int a_SlotNum, short a_BucketItemType) +bool cDispenserEntity::ScoopUpLiquid(int a_SlotNum, short a_ResultingBucketItemType) { - cItem LiquidBucket(a_BucketItemType, 1); + cItem LiquidBucket(a_ResultingBucketItemType, 1); if (m_Contents.GetSlot(a_SlotNum).m_ItemCount == 1) { // Special case: replacing one empty bucket with one full bucket |