diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-10-21 21:16:04 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-10-21 21:16:04 +0200 |
| commit | 6f99615cebba82edcad3d6b3981915285bbefc90 (patch) | |
| tree | a8213436004b417555927f8f094198305a46af40 /src/BlockEntities/DropSpenserEntity.cpp | |
| parent | style. (diff) | |
| parent | Merged branch 'master' of git://github.com/sriehl/MCServer (diff) | |
| download | cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.gz cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.bz2 cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.lz cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.xz cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.zst cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/BlockEntities/DropSpenserEntity.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp index dac951b27..e39b938a0 100644 --- a/src/BlockEntities/DropSpenserEntity.cpp +++ b/src/BlockEntities/DropSpenserEntity.cpp @@ -70,19 +70,19 @@ void cDropSpenserEntity::DropSpense(cChunk & a_Chunk) SlotsCnt++; } } // for i - m_Contents[] - + if (SlotsCnt == 0) { // Nothing in the dropspenser, play the click sound m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.2f); return; } - + int RandomSlot = m_World->GetTickRandomNumber(SlotsCnt - 1); - + // DropSpense the item, using the specialized behavior in the subclasses: DropSpenseFromSlot(a_Chunk, OccupiedSlots[RandomSlot]); - + // Broadcast a smoke and click effects: NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ); int SmokeDir = 0; @@ -132,7 +132,7 @@ bool cDropSpenserEntity::Tick(float a_Dt, cChunk & a_Chunk) { return false; } - + m_ShouldDropSpense = false; DropSpense(a_Chunk); return true; @@ -160,7 +160,7 @@ void cDropSpenserEntity::UsedBy(cPlayer * a_Player) OpenWindow(new cDropSpenserWindow(m_PosX, m_PosY, m_PosZ, this)); Window = GetWindow(); } - + if (Window != NULL) { if (a_Player->GetWindow() != Window) @@ -205,7 +205,3 @@ void cDropSpenserEntity::DropFromSlot(cChunk & a_Chunk, int a_SlotNum) m_World->SpawnItemPickups(Pickups, MicroX, MicroY, MicroZ, PickupSpeedX, PickupSpeedY, PickupSpeedZ); } - - - - |