summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-07-06 14:42:28 +0200
committerMattes D <github@xoft.cz>2014-07-06 14:42:28 +0200
commit562d14e8ecd058b029a248ab42ff60e36f7e2e62 (patch)
treed1ba385b1084b6a1392959d1fbdd5ea57739c7f6
parentFixed slime handling in cMonster::StringToMobType(). (diff)
downloadcuberite-562d14e8ecd058b029a248ab42ff60e36f7e2e62.tar
cuberite-562d14e8ecd058b029a248ab42ff60e36f7e2e62.tar.gz
cuberite-562d14e8ecd058b029a248ab42ff60e36f7e2e62.tar.bz2
cuberite-562d14e8ecd058b029a248ab42ff60e36f7e2e62.tar.lz
cuberite-562d14e8ecd058b029a248ab42ff60e36f7e2e62.tar.xz
cuberite-562d14e8ecd058b029a248ab42ff60e36f7e2e62.tar.zst
cuberite-562d14e8ecd058b029a248ab42ff60e36f7e2e62.zip
Diffstat (limited to '')
-rw-r--r--src/UI/SlotArea.cpp22
-rw-r--r--src/UI/SlotArea.h1
2 files changed, 21 insertions, 2 deletions
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index 48ebf489b..4df04c9e2 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -468,6 +468,20 @@ void cSlotAreaCrafting::OnPlayerRemoved(cPlayer & a_Player)
+void cSlotAreaCrafting::SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item)
+{
+ // Update the recipe after setting the slot, if the slot is not the result slot:
+ super::SetSlot(a_SlotNum, a_Player, a_Item);
+ if (a_SlotNum != 0)
+ {
+ UpdateRecipe(a_Player);
+ }
+}
+
+
+
+
+
void cSlotAreaCrafting::DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots)
{
UNUSED(a_ItemStack);
@@ -545,16 +559,20 @@ void cSlotAreaCrafting::ShiftClickedResult(cPlayer & a_Player)
// Distribute the result, this time for real:
ResultCopy = Result;
m_ParentWindow.DistributeStack(ResultCopy, a_Player, this, true);
-
+
// Remove the ingredients from the crafting grid and update the recipe:
cCraftingRecipe & Recipe = GetRecipeForPlayer(a_Player);
cCraftingGrid Grid(PlayerSlots, m_GridSize, m_GridSize);
Recipe.ConsumeIngredients(Grid);
Grid.CopyToItems(PlayerSlots);
UpdateRecipe(a_Player);
+
+ // Broadcast the window, we sometimes move items to different locations than Vanilla, causing needless desyncs:
+ m_ParentWindow.BroadcastWholeWindow();
+
+ // If the recipe has changed, bail out:
if (!Recipe.GetResult().IsEqual(Result))
{
- // The recipe has changed, bail out
return;
}
}
diff --git a/src/UI/SlotArea.h b/src/UI/SlotArea.h
index b4b693cf6..e271ea454 100644
--- a/src/UI/SlotArea.h
+++ b/src/UI/SlotArea.h
@@ -232,6 +232,7 @@ public:
virtual void Clicked (cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
virtual void DblClicked (cPlayer & a_Player, int a_SlotNum);
virtual void OnPlayerRemoved(cPlayer & a_Player) override;
+ virtual void SetSlot (int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
// Distributing items into this area is completely disabled
virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) override;