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/FurnaceEntity.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/FurnaceEntity.h')
| -rw-r--r-- | src/BlockEntities/FurnaceEntity.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h index 4f935a74b..ed3317af6 100644 --- a/src/BlockEntities/FurnaceEntity.h +++ b/src/BlockEntities/FurnaceEntity.h @@ -14,7 +14,6 @@ namespace Json } class cClientHandle; -class cServer; @@ -45,11 +44,8 @@ public: virtual ~cFurnaceEntity(); static const char * GetClassStatic() { return "cFurnaceEntity"; } - - bool LoadFromJson(const Json::Value & a_Value); // cBlockEntity overrides: - virtual void SaveToJson(Json::Value & a_Value) override; virtual void SendTo(cClientHandle & a_Client) override; virtual bool Tick(float a_Dt, cChunk & a_Chunk) override; virtual void UsedBy(cPlayer * a_Player) override; @@ -105,7 +101,7 @@ protected: NIBBLETYPE m_BlockMeta; /// The recipe for the current input slot - const cFurnaceRecipe::Recipe * m_CurrentRecipe; + const cFurnaceRecipe::cRecipe * m_CurrentRecipe; /// The item that is being smelted cItem m_LastInput; |