1
0

Merge pull request #2069 from HaoTNN/master

Fixes lit furnace issue in #2051
This commit is contained in:
Mattes D 2015-06-05 10:12:10 +02:00
commit 5267285529
4 changed files with 41 additions and 15 deletions

View File

@ -8,6 +8,7 @@ derouinw
Diusrex
Duralex
FakeTruth (founder)
HaoTNN
Howaner
jan64
jasperarmstrong

View File

@ -32,7 +32,8 @@ cFurnaceEntity::cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTY
m_NeedCookTime(0),
m_TimeCooked(0),
m_FuelBurnTime(0),
m_TimeBurned(0)
m_TimeBurned(0),
m_IsLoading(false)
{
m_Contents.AddListener(*this);
}
@ -178,20 +179,15 @@ void cFurnaceEntity::BurnNewFuel(void)
{
cFurnaceRecipe * FR = cRoot::Get()->GetFurnaceRecipe();
int NewTime = FR->GetBurnTime(m_Contents.GetSlot(fsFuel));
if (NewTime == 0)
if ((NewTime == 0) || !CanCookInputToOutput())
{
// The item in the fuel slot is not suitable
// or the input and output isn't available for cooking
SetBurnTimes(0, 0);
SetIsCooking(false);
return;
}
// Is the input and output ready for cooking?
if (!CanCookInputToOutput())
{
return;
}
// Burn one new fuel:
SetBurnTimes(NewTime, 0);
SetIsCooking(true);
@ -218,6 +214,11 @@ void cFurnaceEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
return;
}
if (m_IsLoading)
{
return;
}
ASSERT(a_ItemGrid == &m_Contents);
switch (a_SlotNum)
{
@ -238,7 +239,10 @@ void cFurnaceEntity::UpdateInput(void)
if (!m_Contents.GetSlot(fsInput).IsEqual(m_LastInput))
{
// The input is different from what we had before, reset the cooking time
m_TimeCooked = 0;
if (!m_IsLoading)
{
m_TimeCooked = 0;
}
}
m_LastInput = m_Contents.GetSlot(fsInput);
@ -253,13 +257,17 @@ void cFurnaceEntity::UpdateInput(void)
else
{
m_NeedCookTime = m_CurrentRecipe->CookTime;
SetIsCooking(true);
// Start burning new fuel if there's no flame now:
if (GetFuelBurnTimeLeft() <= 0)
{
BurnNewFuel();
}
// Already burning, set cooking to ensure that cooking is occuring
else
{
SetIsCooking(true);
}
}
}
@ -293,11 +301,19 @@ void cFurnaceEntity::UpdateOutput(void)
return;
}
// No need to burn new fuel, the Tick() function will take care of that
// Can cook, start cooking if not already underway:
m_NeedCookTime = m_CurrentRecipe->CookTime;
SetIsCooking(m_FuelBurnTime > 0);
// Check if fuel needs to start a burn
if (GetFuelBurnTimeLeft() <= 0)
{
BurnNewFuel();
}
// Already burning, set cooking to ensure that cooking is occuring
else
{
SetIsCooking(true);
}
}

View File

@ -101,6 +101,11 @@ public:
m_TimeCooked = a_TimeCooked;
}
void SetLoading(bool a_IsLoading)
{
m_IsLoading = a_IsLoading;
}
protected:
/** Block meta of the block currently represented by this entity */
@ -129,6 +134,9 @@ protected:
/** Amount of ticks that the current fuel has been burning */
int m_TimeBurned;
/** Is the block currently being loaded into the world? */
bool m_IsLoading;
/** Sends the specified progressbar value to all clients of the window */
void BroadcastProgress(short a_ProgressbarID, short a_Value);

View File

@ -1052,7 +1052,8 @@ cBlockEntity * cWSSAnvil::LoadFurnaceFromNBT(const cParsedNBT & a_NBT, int a_Tag
}
std::unique_ptr<cFurnaceEntity> Furnace(new cFurnaceEntity(a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta, m_World));
Furnace->SetLoading(true);
// Load slots:
for (int Child = a_NBT.GetFirstChild(Items); Child != -1; Child = a_NBT.GetNextSibling(Child))
{
@ -1085,9 +1086,9 @@ cBlockEntity * cWSSAnvil::LoadFurnaceFromNBT(const cParsedNBT & a_NBT, int a_Tag
// Anvil doesn't store the time that an item takes to cook. We simply use the default - 10 seconds (200 ticks)
Furnace->SetCookTimes(200, ct);
}
// Restart cooking:
Furnace->ContinueCooking();
Furnace->SetLoading(false);
return Furnace.release();
}