2 files changed, 109 insertions, 142 deletions

diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp
index 4452fc00a..222b27637 100644
--- a/src/BlockEntities/FurnaceEntity.cpp
+++ b/src/BlockEntities/FurnaceEntity.cpp
@@ -5,6 +5,7 @@
 #include "../UI/Window.h"
 #include "../Entities/Player.h"
 #include "../Root.h"
+#include "Chunk.h"
 
 
 
@@ -13,8 +14,9 @@
 
 enum
 {
-	PROGRESSBAR_SMELTING = 0,
-	PROGRESSBAR_FUEL = 1,
+	PROGRESSBAR_FUEL = 0,
+	PROGRESSBAR_SMELTING = 2,
+	PROGRESSBAR_SMELTING_CONFIRM = 3,
 } ;
 
 
@@ -23,7 +25,6 @@ enum
 
 cFurnaceEntity::cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World) :
 	super(E_BLOCK_FURNACE, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),
-	m_BlockType(a_BlockType),
 	m_BlockMeta(a_BlockMeta),
 	m_CurrentRecipe(NULL),
 	m_IsCooking((a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_LIT_FURNACE)),
@@ -31,8 +32,7 @@ cFurnaceEntity::cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTY
 	m_TimeCooked(0),
 	m_FuelBurnTime(0),
 	m_TimeBurned(0),
-	m_LastProgressFuel(0),
-	m_LastProgressCook(0)
+	m_IsDestroyed(false)
 {
 	m_Contents.AddListener(*this);
 }
@@ -57,27 +57,28 @@ cFurnaceEntity::~cFurnaceEntity()
 
 void cFurnaceEntity::UsedBy(cPlayer * a_Player)
 {
-	if (GetWindow() == NULL)
+	cWindow * Window = GetWindow();
+	if (Window == NULL)
 	{
 		OpenWindow(new cFurnaceWindow(m_PosX, m_PosY, m_PosZ, this));
+		Window = GetWindow();
 	}
-	cWindow * Window = GetWindow();
+
 	if (Window != NULL)
 	{
 		if (a_Player->GetWindow() != Window)
 		{
 			a_Player->OpenWindow(Window);
-			BroadcastProgress(PROGRESSBAR_FUEL,     (short)m_LastProgressFuel);
-			BroadcastProgress(PROGRESSBAR_SMELTING, (short)m_LastProgressCook);
 		}
 	}
+
+	UpdateProgressBars(true);
 }
 
 
 
 
 
-/// Restarts cooking. Used after the furnace is loaded from storage to set up the internal variables so that cooking continues, if it was active. Returns true if cooking.
 bool cFurnaceEntity::ContinueCooking(void)
 {
 	UpdateInput();
@@ -92,14 +93,16 @@ bool cFurnaceEntity::ContinueCooking(void)
 bool cFurnaceEntity::Tick(float a_Dt, cChunk & a_Chunk)
 {
 	UNUSED(a_Dt);
-	UNUSED(a_Chunk);
+
 	if (m_FuelBurnTime <= 0)
 	{
-		// No fuel is burning, reset progressbars and bail out
-		if ((m_LastProgressCook > 0) || (m_LastProgressFuel > 0))
-		{
-			UpdateProgressBars();
-		}
+		// Cooked time decreases twice as fast when ran out of fuel
+		m_TimeCooked -= 2;
+		m_TimeCooked = std::max(m_TimeCooked, 0);
+
+		// Reset progressbars, block type, and bail out
+		a_Chunk.FastSetBlock(GetRelX(), m_PosY, GetRelZ(), E_BLOCK_FURNACE, m_BlockMeta);
+		UpdateProgressBars();
 		return false;
 	}
 
@@ -139,12 +142,12 @@ void cFurnaceEntity::SendTo(cClientHandle & a_Client)
 
 
 
-void cFurnaceEntity::BroadcastProgress(int a_ProgressbarID, short a_Value)
+void cFurnaceEntity::BroadcastProgress(short a_ProgressbarID, short a_Value)
 {
 	cWindow * Window = GetWindow();
 	if (Window != NULL)
 	{
-		Window->BroadcastProgress(a_ProgressbarID, a_Value);
+		Window->SetProperty(a_ProgressbarID, a_Value);
 	}
 }
 
@@ -152,7 +155,6 @@ void cFurnaceEntity::BroadcastProgress(int a_ProgressbarID, short a_Value)
 
 
 
-/// One item finished cooking
 void cFurnaceEntity::FinishOne()
 {
 	m_TimeCooked = 0;
@@ -166,8 +168,6 @@ void cFurnaceEntity::FinishOne()
 		m_Contents.ChangeSlotCount(fsOutput, m_CurrentRecipe->Out->m_ItemCount);
 	}
 	m_Contents.ChangeSlotCount(fsInput, -m_CurrentRecipe->In->m_ItemCount);
-	
-	UpdateIsCooking();
 }
 
 
@@ -181,8 +181,7 @@ void cFurnaceEntity::BurnNewFuel(void)
 	if (NewTime == 0)
 	{
 		// The item in the fuel slot is not suitable
-		m_FuelBurnTime = 0;
-		m_TimeBurned = 0;
+		SetBurnTimes(0, 0);
 		SetIsCooking(false);
 		return;
 	}
@@ -194,8 +193,7 @@ void cFurnaceEntity::BurnNewFuel(void)
 	}
 
 	// Burn one new fuel:
-	m_FuelBurnTime = NewTime;
-	m_TimeBurned = 0;
+	SetBurnTimes(NewTime, 0);
 	SetIsCooking(true);
 	if (m_Contents.GetSlot(fsFuel).m_ItemType == E_ITEM_LAVA_BUCKET)
 	{
@@ -214,33 +212,19 @@ void cFurnaceEntity::BurnNewFuel(void)
 void cFurnaceEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
 {
 	super::OnSlotChanged(a_ItemGrid, a_SlotNum);
-	
-	if (m_World == NULL)
+
+	if (m_IsDestroyed)
 	{
-		// The furnace isn't initialized yet, do no processing
 		return;
 	}
 	
 	ASSERT(a_ItemGrid == &m_Contents);
 	switch (a_SlotNum)
 	{
-		case fsInput:
-		{
-			UpdateInput();
-			break;
-		}
-		
-		case fsFuel:
-		{
-			UpdateFuel();
-			break;
-		}
-		
-		case fsOutput:
-		{
-			UpdateOutput();
-			break;
-		}
+		case fsInput: UpdateInput(); break;		
+		case fsFuel: UpdateFuel(); break;		
+		case fsOutput: UpdateOutput(); break;
+		default: ASSERT(!"Invalid furnace slot update!"); break;
 	}
 }
 
@@ -249,7 +233,6 @@ void cFurnaceEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
 
 
 
-/// Updates the current recipe, based on the current input
 void cFurnaceEntity::UpdateInput(void)
 {
 	if (!m_Contents.GetSlot(fsInput).IsEqual(m_LastInput))
@@ -263,8 +246,8 @@ void cFurnaceEntity::UpdateInput(void)
 	m_CurrentRecipe = FR->GetRecipeFrom(m_Contents.GetSlot(fsInput));
 	if (!CanCookInputToOutput())
 	{
-		// This input cannot be cooked
-		m_NeedCookTime = 0;
+		// This input cannot be cooked, reset cook counter immediately
+		SetCookTimes(0, 0);
 		SetIsCooking(false);
 	}
 	else
@@ -284,7 +267,6 @@ void cFurnaceEntity::UpdateInput(void)
 
 
 
-/// Called when the fuel slot changes or when the fuel is spent, burns another piece of fuel if appropriate
 void cFurnaceEntity::UpdateFuel(void)
 {
 	if (m_FuelBurnTime > m_TimeBurned)
@@ -301,14 +283,12 @@ void cFurnaceEntity::UpdateFuel(void)
 
 
 
-/// Called when the output slot changes; starts burning if space became available
 void cFurnaceEntity::UpdateOutput(void)
 {
 	if (!CanCookInputToOutput())
 	{
 		// Cannot cook anymore:
-		m_TimeCooked = 0;
-		m_NeedCookTime = 0;
+		SetCookTimes(0, 0);
 		SetIsCooking(false);
 		return;
 	}
@@ -324,30 +304,6 @@ void cFurnaceEntity::UpdateOutput(void)
 
 
 
-/// Updates the m_IsCooking, based on the input slot, output slot and m_FuelBurnTime / m_TimeBurned
-void cFurnaceEntity::UpdateIsCooking(void)
-{
-	if (
-		!CanCookInputToOutput() ||        // Cannot cook this
-		(m_FuelBurnTime <= 0) ||          // No fuel
-		(m_TimeBurned >= m_FuelBurnTime)  // Fuel burnt out
-	)
-	{
-		// Reset everything
-		SetIsCooking(false);
-		m_TimeCooked = 0;
-		m_NeedCookTime = 0;
-		return;
-	}
-	
-	SetIsCooking(true);
-}
-
-
-
-
-
-/// Returns true if the input can be cooked into output and the item counts allow for another cooking operation
 bool cFurnaceEntity::CanCookInputToOutput(void) const
 {
 	if (m_CurrentRecipe == NULL)
@@ -382,25 +338,20 @@ bool cFurnaceEntity::CanCookInputToOutput(void) const
 
 
 
-/// Broadcasts progressbar updates, if needed
-void cFurnaceEntity::UpdateProgressBars(void)
+void cFurnaceEntity::UpdateProgressBars(bool a_ForceUpdate)
 {
 	// In order to preserve bandwidth, an update is sent only every 10th tick
-	// That's why the comparisons use the division by eight
-	
-	int CurFuel = (m_FuelBurnTime > 0) ? (200 - 200 * m_TimeBurned / m_FuelBurnTime) : 0;
-	if ((CurFuel / 8) != (m_LastProgressFuel / 8))
+	if (!a_ForceUpdate && (m_World->GetWorldAge() % 10 != 0))
 	{
-		BroadcastProgress(PROGRESSBAR_FUEL, (short)CurFuel);
-		m_LastProgressFuel = CurFuel;
+		return;
 	}
 	
-	int CurCook = (m_NeedCookTime > 0) ? (200 * m_TimeCooked / m_NeedCookTime) : 0;
-	if ((CurCook / 8) != (m_LastProgressCook / 8))
-	{
-		BroadcastProgress(PROGRESSBAR_SMELTING, (short)CurCook);
-		m_LastProgressCook = CurCook;
-	}
+	int CurFuel = (m_FuelBurnTime > 0) ? 200 - (200 * m_TimeBurned / m_FuelBurnTime) : 0;
+	BroadcastProgress(PROGRESSBAR_FUEL, (short)CurFuel);
+	
+	int CurCook = (m_NeedCookTime > 0) ? (200 * m_TimeCooked / m_NeedCookTime) : 0;	
+	BroadcastProgress(PROGRESSBAR_SMELTING_CONFIRM, 200);  // Post 1.8, Mojang requires a random packet with an ID of three and value of 200. Wat. Wat. Wat.
+	BroadcastProgress(PROGRESSBAR_SMELTING, (short)CurCook);
 }
 
 
@@ -413,11 +364,13 @@ void cFurnaceEntity::SetIsCooking(bool a_IsCooking)
 	{
 		return;
 	}
-
 	m_IsCooking = a_IsCooking;
-		
-	// Light or extinguish the furnace:
-	m_World->FastSetBlock(m_PosX, m_PosY, m_PosZ, m_IsCooking ? E_BLOCK_LIT_FURNACE : E_BLOCK_FURNACE, m_BlockMeta);
+
+	// Only light the furnace as it is extinguished only when the fuel runs out, not when cooking stops - handled in this::Tick()
+	if (m_IsCooking)
+	{
+		m_World->FastSetBlock(m_PosX, m_PosY, m_PosZ, E_BLOCK_LIT_FURNACE, m_BlockMeta);
+	}
 }
 
 
diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h
index ed3317af6..14dadbec8 100644
--- a/src/BlockEntities/FurnaceEntity.h
+++ b/src/BlockEntities/FurnaceEntity.h
@@ -38,7 +38,7 @@ public:
 	
 	// tolua_end
 	
-	/// Constructor used for normal operation
+	/** Constructor used for normal operation */
 	cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World);
 	
 	virtual ~cFurnaceEntity();
@@ -49,103 +49,117 @@ public:
 	virtual void SendTo(cClientHandle & a_Client) override;
 	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
 	virtual void UsedBy(cPlayer * a_Player) override;
+	virtual void Destroy() override
+	{
+		m_IsDestroyed = true;
+		super::Destroy();
+	}
 
-	/// Restarts cooking. Used after the furnace is loaded from storage to set up the internal variables so that cooking continues, if it was active. Returns true if cooking.
+	/** Restarts cooking
+	Used after the furnace is loaded from storage to set up the internal variables so that cooking continues, if it was active
+	Returns true if cooking */
 	bool ContinueCooking(void);
-
-	void ResetCookTimer();
 	
 	// tolua_begin
 	
-	/// Returns the item in the input slot
+	/** Returns the item in the input slot */
 	const cItem & GetInputSlot(void) const { return GetSlot(fsInput); }
 	
-	/// Returns the item in the fuel slot
+	/** Returns the item in the fuel slot */
 	const cItem & GetFuelSlot(void) const { return GetSlot(fsFuel); }
 	
-	/// Returns the item in the output slot
+	/** Returns the item in the output slot */
 	const cItem & GetOutputSlot(void) const { return GetSlot(fsOutput); }
 	
-	/// Sets the item in the input slot
+	/** Sets the item in the input slot */
 	void SetInputSlot(const cItem & a_Item) { SetSlot(fsInput, a_Item); }
 	
-	/// Sets the item in the fuel slot
+	/** Sets the item in the fuel slot */
 	void SetFuelSlot(const cItem & a_Item) { SetSlot(fsFuel, a_Item); }
 	
-	/// Sets the item in the output slot
+	/** Sets the item in the output slot */
 	void SetOutputSlot(const cItem & a_Item) { SetSlot(fsOutput, a_Item); }
 	
-	/// Returns the time that the current item has been cooking, in ticks
-	int GetTimeCooked(void) const {return m_TimeCooked; }
+	/** Returns the time that the current item has been cooking, in ticks */
+	int GetTimeCooked(void) const { return m_TimeCooked; }
 	
-	/// Returns the time until the current item finishes cooking, in ticks
+	/** Returns the time until the current item finishes cooking, in ticks */
 	int GetCookTimeLeft(void) const { return m_NeedCookTime - m_TimeCooked; }
 	
-	/// Returns the time until the current fuel is depleted, in ticks
-	int GetFuelBurnTimeLeft(void) const {return m_FuelBurnTime - m_TimeBurned; }
+	/** Returns the time until the current fuel is depleted, in ticks */
+	int GetFuelBurnTimeLeft(void) const { return m_FuelBurnTime - m_TimeBurned; }
 	
-	/// Returns true if there's time left before the current fuel is depleted
+	/** Returns true if there's time left before the current fuel is depleted */
 	bool HasFuelTimeLeft(void) const { return (GetFuelBurnTimeLeft() > 0); }
 	
 	// tolua_end
 	
-	void SetBurnTimes(int a_FuelBurnTime, int a_TimeBurned) {m_FuelBurnTime = a_FuelBurnTime; m_TimeBurned = a_TimeBurned; }
-	void SetCookTimes(int a_NeedCookTime, int a_TimeCooked) {m_NeedCookTime = a_NeedCookTime; m_TimeCooked = a_TimeCooked; }
+	void SetBurnTimes(int a_FuelBurnTime, int a_TimeBurned)
+	{
+		m_FuelBurnTime = a_FuelBurnTime;
+		m_TimeBurned = a_TimeBurned;
+	}
+
+	void SetCookTimes(int a_NeedCookTime, int a_TimeCooked)
+	{
+		m_NeedCookTime = a_NeedCookTime;
+		m_TimeCooked = a_TimeCooked;
+	}
 	
 protected:
-
-	/// Block type of the block currently represented by this entity (changes when furnace lights up)
-	BLOCKTYPE m_BlockType;
 	
-	/// Block meta of the block currently represented by this entity
+	/** Block meta of the block currently represented by this entity */
 	NIBBLETYPE m_BlockMeta;
 
-	/// The recipe for the current input slot
+	/** The recipe for the current input slot */
 	const cFurnaceRecipe::cRecipe * m_CurrentRecipe;
 	
-	/// The item that is being smelted
+	/** The item that is being smelted */
 	cItem m_LastInput;
+
+	/** Set to true when the furnace entity has been destroyed to prevent the block being set again */
+	bool m_IsDestroyed;
 	
-	bool m_IsCooking;  ///< Set to true if the furnace is cooking an item
-	
-	// All timers are in ticks
-	int m_NeedCookTime;  ///< Amount of time needed to fully cook current item
-	int m_TimeCooked;    ///< Amount of time that the current item has been cooking
-	int m_FuelBurnTime;  ///< Amount of time that the current fuel can burn (in total); zero if no fuel burning
-	int m_TimeBurned;    ///< Amount of time that the current fuel has been burning
-	
-	int m_LastProgressFuel;  ///< Last value sent as the progress for the fuel
-	int m_LastProgressCook;  ///< Last value sent as the progress for the cooking
+	/** Set to true if the furnace is cooking an item */
+	bool m_IsCooking;
 	
+	/** Amount of ticks needed to fully cook current item */
+	int m_NeedCookTime;
+
+	/** Amount of ticks that the current item has been cooking */
+	int m_TimeCooked;
+
+	/** Amount of ticks that the current fuel can burn (in total); zero if no fuel burning */
+	int m_FuelBurnTime;
+
+	/** Amount of ticks that the current fuel has been burning */
+	int m_TimeBurned;	
 	
-	/// Sends the specified progressbar value to all clients of the window
-	void BroadcastProgress(int a_ProgressbarID, short a_Value);
+	/** Sends the specified progressbar value to all clients of the window */
+	void BroadcastProgress(short a_ProgressbarID, short a_Value);
 	
-	/// One item finished cooking
+	/** One item finished cooking */
 	void FinishOne();
 	
-	/// Starts burning a new fuel, if possible
+	/** Starts burning a new fuel, if possible */
 	void BurnNewFuel(void);
 	
-	/// Updates the recipe, based on the current input
+	/** Updates the recipe, based on the current input */
 	void UpdateInput(void);
 	
-	/// Called when the fuel slot changes or when the fuel is spent, burns another piece of fuel if appropriate
+	/** Called when the fuel slot changes or when the fuel is spent, burns another piece of fuel if appropriate */
 	void UpdateFuel(void);
 	
-	/// Called when the output slot changes
+	/** Called when the output slot changes */
 	void UpdateOutput(void);
 	
-	/// Updates the m_IsCooking, based on the input slot, output slot and m_FuelBurnTime / m_TimeBurned
-	void UpdateIsCooking(void);
-	
-	/// Returns true if the input can be cooked into output and the item counts allow for another cooking operation
+	/** Returns true if the input can be cooked into output and the item counts allow for another cooking operation */
 	bool CanCookInputToOutput(void) const;
 	
-	/// Broadcasts progressbar updates, if needed
-	void UpdateProgressBars(void);
+	/** Broadcasts progressbar updates, if needed */
+	void UpdateProgressBars(bool a_ForceUpdate = false);
 	
-	/// Sets the m_IsCooking variable, updates the furnace block type based on the value
+	/** Sets the m_IsCooking variable, updates the furnace block type based on the value */
 	void SetIsCooking(bool a_IsCooking);
 	
 	// cItemGrid::cListener overrides: