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/JukeboxEntity.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/JukeboxEntity.cpp')
| -rw-r--r-- | src/BlockEntities/JukeboxEntity.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp index f505a3030..ef2069d72 100644 --- a/src/BlockEntities/JukeboxEntity.cpp +++ b/src/BlockEntities/JukeboxEntity.cpp @@ -10,10 +10,11 @@ -cJukeboxEntity::cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) : - super(E_BLOCK_JUKEBOX, a_BlockX, a_BlockY, a_BlockZ, a_World), +cJukeboxEntity::cJukeboxEntity(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), m_Record(0) { + ASSERT(a_BlockType == E_BLOCK_JUKEBOX); } @@ -28,6 +29,17 @@ cJukeboxEntity::~cJukeboxEntity() +void cJukeboxEntity::CopyFrom(const cBlockEntity & a_Src) +{ + Super::CopyFrom(a_Src); + auto & src = reinterpret_cast<const cJukeboxEntity &>(a_Src); + m_Record = src.m_Record; +} + + + + + bool cJukeboxEntity::UsedBy(cPlayer * a_Player) { if (IsPlayingRecord()) |