summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaniel0916 <theschokolps@gmail.com>2014-04-14 11:48:12 +0200
committerdaniel0916 <theschokolps@gmail.com>2014-04-14 11:48:12 +0200
commit856e900bf8e74cb478904d6322dcb6310ff7a3b2 (patch)
treead793b40bdefc94e9fe9a59fe76333f4769869b7
parentFixed invisibility enchantments (diff)
downloadcuberite-856e900bf8e74cb478904d6322dcb6310ff7a3b2.tar
cuberite-856e900bf8e74cb478904d6322dcb6310ff7a3b2.tar.gz
cuberite-856e900bf8e74cb478904d6322dcb6310ff7a3b2.tar.bz2
cuberite-856e900bf8e74cb478904d6322dcb6310ff7a3b2.tar.lz
cuberite-856e900bf8e74cb478904d6322dcb6310ff7a3b2.tar.xz
cuberite-856e900bf8e74cb478904d6322dcb6310ff7a3b2.tar.zst
cuberite-856e900bf8e74cb478904d6322dcb6310ff7a3b2.zip
Diffstat (limited to '')
-rw-r--r--src/ClientHandle.cpp4
-rw-r--r--src/Protocol/Protocol17x.cpp3
-rw-r--r--src/UI/SlotArea.cpp32
-rw-r--r--src/UI/SlotArea.h8
4 files changed, 21 insertions, 26 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 2dd9cb91e..fc4db1d10 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -2689,14 +2689,14 @@ void cClientHandle::SocketClosed(void)
void cClientHandle::HandleEnchantItem(Byte & WindowID, Byte & Enchantment)
{
- cItem Item = m_Player->GetDraggingItem();
+ cEnchantingWindow * Window = (cEnchantingWindow*)m_Player->GetWindow();
+ cItem Item = *Window->m_SlotArea->GetSlot(0, *m_Player);
if (!cItem::IsEnchantable(Item.m_ItemType))
{
return;
}
- cEnchantingWindow * Window = (cEnchantingWindow*)m_Player->GetWindow();
int BaseEnchantmentLevel = Window->GetPropertyValue(Enchantment);
// Step 1 from Enchanting
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 785dbf935..a31643ccf 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -1918,10 +1918,7 @@ void cProtocol172::HandlePacketEnchantItem(cByteBuffer & a_ByteBuffer)
HANDLE_READ(a_ByteBuffer, ReadByte, Byte, WindowID);
HANDLE_READ(a_ByteBuffer, ReadByte, Byte, Enchantment);
- LOGWARN("Protocol 1.7: Enchantment Packet received!");
-
m_Client->HandleEnchantItem(WindowID, Enchantment);
-
}
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index 35230cffb..673c036b6 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -608,8 +608,21 @@ cSlotAreaTemporary(a_NumSlots, a_ParentWindow)
+void cSlotAreaEnchanting::OnPlayerRemoved(cPlayer & a_Player)
+{
+ // Toss the item in the enchanting slot
+ TossItems(a_Player, 0, 1);
+ // Player not found - that is acceptable
+}
+
+
+
+
+
void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem)
{
+ super::Clicked(a_Player, a_SlotNum, a_ClickAction, a_ClickedItem);
+
// Check if Slot is in the Enchantment Table
if (a_SlotNum == 0)
{
@@ -621,20 +634,7 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
{
ClickedResult(a_Player);
}
- return;
}
- super::Clicked(a_Player, a_SlotNum, a_ClickAction, a_ClickedItem);
-}
-
-
-
-
-
-void cSlotAreaEnchanting::OnPlayerRemoved(cPlayer & a_Player)
-{
- // Toss the item in the enchanting slot
- TossItems(a_Player, 0, 0);
- // Player not found - that is acceptable
}
@@ -643,13 +643,15 @@ void cSlotAreaEnchanting::OnPlayerRemoved(cPlayer & a_Player)
void cSlotAreaEnchanting::ClickedResult(cPlayer & a_Player)
{
- if (a_Player.GetDraggingItem().IsEmpty())
+ cItem Item = *GetSlot(0, a_Player);
+
+ if (Item.IsEmpty())
{
m_ParentWindow.SetProperty(0, 0, a_Player);
m_ParentWindow.SetProperty(1, 0, a_Player);
m_ParentWindow.SetProperty(2, 0, a_Player);
}
- else if (cItem::IsEnchantable(a_Player.GetDraggingItem().m_ItemType))
+ else if (cItem::IsEnchantable(Item.m_ItemType))
{
int PosX = 0;
int PosY = 0;
diff --git a/src/UI/SlotArea.h b/src/UI/SlotArea.h
index 82360ffbe..7feb74aa1 100644
--- a/src/UI/SlotArea.h
+++ b/src/UI/SlotArea.h
@@ -258,21 +258,17 @@ class cSlotAreaEnchanting :
typedef cSlotAreaTemporary super;
public:
- /// a_GridSize is allowed to be only 2 or 3
cSlotAreaEnchanting(int a_NumSlots, cWindow & a_ParentWindow);
// cSlotAreaTemporary overrides:
virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
virtual void OnPlayerRemoved(cPlayer & a_Player) 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 {}
-
protected:
- /// Handles a click in the result slot. Crafts using the current recipe, if possible
+ /// Handles a click in the item slot.
void ClickedResult(cPlayer & a_Player);
- /// Handles a shift-click in the result slot. Crafts using the current recipe until it changes or no more space for result.
+ /// Handles a shift-click in the item slot.
void ShiftClickedResult(cPlayer & a_Player);
};