flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Minor cBrewingRecipes cleanup (#3731)

Browse Source
This commit is contained in:
peterbell10
2017-05-28 19:08:23 +01:00
committed by Lukas Pioch
parent f261a03c14
commit ad4172d21c
4 changed files with 58 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BlockEntities/BrewingstandEntity.cpp
View File

@@ -141,7 +141,7 @@ bool cBrewingstandEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
}
Recipe = m_CurrentBrewingRecipes[i];
m_Contents.SetSlot(i, Recipe->Output->CopyOne());
m_Contents.SetSlot(i, Recipe->Output.CopyOne());
}
// Brewing process completed
@@ -243,7 +243,7 @@ void cBrewingstandEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
if (m_CurrentBrewingRecipes[i] != nullptr)
{
Recipe = m_CurrentBrewingRecipes[i];
if (Recipe->Ingredient->IsEqual(GetSlot(bsIngredient)) && Recipe->Input->IsEqual(GetSlot(i)))
if (Recipe->Ingredient.IsEqual(GetSlot(bsIngredient)) && Recipe->Input.IsEqual(GetSlot(i)))
{
Stop = false;
continue;
@@ -255,7 +255,7 @@ void cBrewingstandEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
{
// Found a brewing recipe for the items
m_CurrentBrewingRecipes[i] = Recipe;
m_Results[i] = Recipe->Output->CopyOne();
m_Results[i] = Recipe->Output.CopyOne();
Stop = false;
}
}
@@ -330,7 +330,7 @@ void cBrewingstandEntity::LoadRecipes(void)
if (Recipe != nullptr)
{
m_CurrentBrewingRecipes[i] = Recipe;
m_Results[i] = Recipe->Output->CopyOne();
m_Results[i] = Recipe->Output.CopyOne();
}
}
}