1
0

Fixed merge conflict

This commit is contained in:
daniel0916 2014-04-07 20:11:43 +02:00
parent af566d5a79
commit 93a7494e4b

View File

@ -214,9 +214,6 @@ public:
/// Handles the block placing packet when it is a real block placement (not block-using, item-using or eating) /// Handles the block placing packet when it is a real block placement (not block-using, item-using or eating)
void HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, cItemHandler & a_ItemHandler); void HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, cItemHandler & a_ItemHandler);
///Handle item enchanting
void HandleEnchantItem(Byte & WindowID, Byte & Enchantment);
private: private: