diff options
| author | Alexander Harkness <bearbin@gmail.com> | 2014-10-11 19:32:21 +0200 |
|---|---|---|
| committer | Alexander Harkness <bearbin@gmail.com> | 2014-10-11 19:32:21 +0200 |
| commit | 93833069a80fe4aec33a95148df39ad40671ddaf (patch) | |
| tree | 2e6a335a60e618b5fe456ca8a586a2c5448c8c87 /src/BlockEntities/JukeboxEntity.h | |
| parent | Reverted submodule changes. (diff) | |
| parent | Merge pull request #1528 from kjanku1/master (diff) | |
| download | cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.gz cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.bz2 cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.lz cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.xz cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.zst cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.zip | |
Diffstat (limited to 'src/BlockEntities/JukeboxEntity.h')
| -rw-r--r-- | src/BlockEntities/JukeboxEntity.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h index d677d340f..49d2faa89 100644 --- a/src/BlockEntities/JukeboxEntity.h +++ b/src/BlockEntities/JukeboxEntity.h @@ -2,7 +2,6 @@ #pragma once #include "BlockEntity.h" -#include "../Entities/Player.h" @@ -30,9 +29,6 @@ public: cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World); virtual ~cJukeboxEntity(); - bool LoadFromJson(const Json::Value & a_Value); - virtual void SaveToJson(Json::Value & a_Value) override; - // tolua_begin int GetRecord(void); |