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

Fixed invisibility enchantments

Browse Source
This commit is contained in:
daniel0916 2014-04-13 22:15:10 +02:00
parent 9dc4617e8d
commit fce9ea65c3
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ClientHandle.cpp
View File

@ -3115,7 +3115,9 @@ void cClientHandle::HandleEnchantItem(Byte & WindowID, Byte & Enchantment)
if (m_Player->DeltaExperience(-m_Player->XpForLevel(Window->GetPropertyValue(Enchantment))) >= 0 || m_Player->IsGameModeCreative()) if (m_Player->DeltaExperience(-m_Player->XpForLevel(Window->GetPropertyValue(Enchantment))) >= 0 || m_Player->IsGameModeCreative())
{ {
m_Player->GetWindow()->SetSlot(*m_Player, 0, Item); Window->m_SlotArea->SetSlot(0, *m_Player, Item);
Window->SendSlot(*m_Player, Window->m_SlotArea, 0);
Window->BroadcastWholeWindow();
Window->SetProperty(0, 0, *m_Player); Window->SetProperty(0, 0, *m_Player);
Window->SetProperty(1, 0, *m_Player); Window->SetProperty(1, 0, *m_Player);

1
src/ClientHandle.h
View File

@ -19,6 +19,7 @@
#include "Scoreboard.h" #include "Scoreboard.h"
#include "Map.h" #include "Map.h"
#include "Enchantments.h" #include "Enchantments.h"
#include "UI/SlotArea.h"

2
src/UI/SlotArea.cpp
View File

@ -600,6 +600,8 @@ cCraftingRecipe & cSlotAreaCrafting::GetRecipeForPlayer(cPlayer & a_Player)
cSlotAreaEnchanting::cSlotAreaEnchanting(int a_NumSlots, cWindow & a_ParentWindow) : cSlotAreaEnchanting::cSlotAreaEnchanting(int a_NumSlots, cWindow & a_ParentWindow) :
cSlotAreaTemporary(a_NumSlots, a_ParentWindow) cSlotAreaTemporary(a_NumSlots, a_ParentWindow)
{ {
cEnchantingWindow * Window = (cEnchantingWindow *)&m_ParentWindow;
Window->m_SlotArea = this;
} }

2
src/UI/Window.h
View File

@ -246,6 +246,8 @@ public:
/** Set the Position Values to the Position of the Enchantment Table */ /** Set the Position Values to the Position of the Enchantment Table */
void GetBlockPos(int & a_PosX, int & a_PosY, int & a_PosZ); void GetBlockPos(int & a_PosX, int & a_PosY, int & a_PosZ);
cSlotArea * m_SlotArea;
protected: protected:
int m_PropertyValue0, m_PropertyValue1, m_PropertyValue2; int m_PropertyValue0, m_PropertyValue1, m_PropertyValue2;
int m_BlockX, m_BlockY, m_BlockZ; int m_BlockX, m_BlockY, m_BlockZ;