Fixed merge conflict
This commit is contained in:
parent
af566d5a79
commit
93a7494e4b
@ -215,9 +215,6 @@ public:
|
||||
/// 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);
|
||||
|
||||
///Handle item enchanting
|
||||
void HandleEnchantItem(Byte & WindowID, Byte & Enchantment);
|
||||
|
||||
private:
|
||||
|
||||
int m_ViewDistance; // Number of chunks the player can see in each direction; 4 is the minimum ( http://wiki.vg/Protocol_FAQ#.E2.80.A6all_connecting_clients_spasm_and_jerk_uncontrollably.21 )
|
||||
|
Loading…
Reference in New Issue
Block a user