1.8: Added new uuid field.

src/ClientHandle.cpp

@@ -1192,6 +1192,8 @@ void cClientHandle::FinishDigAnimation()
 
 void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, const cItem & a_HeldItem)
 {
+	// TODO: Rewrite this function
+
 	LOGD("HandleRightClick: {%d, %d, %d}, face %d, HeldItem: %s",
 		a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, ItemToFullString(a_HeldItem).c_str()
 	);
@@ -1204,14 +1206,17 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e
 	)
 	{
 		AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
-		World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player);
+		if ((a_BlockX >= 0) && (a_BlockY >= 0) && (a_BlockZ >= 0))
-		if (a_BlockY < cChunkDef::Height - 1)
 		{
-			World->SendBlockTo(a_BlockX, a_BlockY + 1, a_BlockZ, m_Player);  // 2 block high things
+			World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player);
-		}
+			if (a_BlockY < cChunkDef::Height - 1)
-		if (a_BlockY > 0)
+			{
-		{
+				World->SendBlockTo(a_BlockX, a_BlockY + 1, a_BlockZ, m_Player);  // 2 block high things
-			World->SendBlockTo(a_BlockX, a_BlockY - 1, a_BlockZ, m_Player);  // 2 block high things
+			}
+			if (a_BlockY > 0)
+			{
+				World->SendBlockTo(a_BlockX, a_BlockY - 1, a_BlockZ, m_Player);  // 2 block high things
+			}
 		}
 		m_Player->GetInventory().SendEquippedSlot();
 		return;
@@ -1221,17 +1226,20 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e
 	if (PlgMgr->CallHookPlayerRightClick(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ))
 	{
 		// A plugin doesn't agree with the action, replace the block on the client and quit:
-		cChunkInterface ChunkInterface(World->GetChunkMap());
+		if ((a_BlockX >= 0) && (a_BlockY >= 0) && (a_BlockZ >= 0))
-		BLOCKTYPE BlockType = World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
-		cBlockHandler * BlockHandler = cBlockInfo::GetHandler(BlockType);
-		BlockHandler->OnCancelRightClick(ChunkInterface, *World, m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
-		
-		if (a_BlockFace != BLOCK_FACE_NONE)
 		{
-			AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
+			cChunkInterface ChunkInterface(World->GetChunkMap());
-			World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player);
+			BLOCKTYPE BlockType = World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
-			World->SendBlockTo(a_BlockX, a_BlockY + 1, a_BlockZ, m_Player);  // 2 block high things
+			cBlockHandler * BlockHandler = cBlockInfo::GetHandler(BlockType);
-			m_Player->GetInventory().SendEquippedSlot();
+			BlockHandler->OnCancelRightClick(ChunkInterface, *World, m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
+
+			if (a_BlockFace != BLOCK_FACE_NONE)
+			{
+				AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
+				World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player);
+				World->SendBlockTo(a_BlockX, a_BlockY + 1, a_BlockZ, m_Player);  // 2 block high things
+				m_Player->GetInventory().SendEquippedSlot();
+			}
 		}
 		return;
 	}

src/Protocol/Protocol18x.cpp

@@ -2586,6 +2586,23 @@ cProtocol180::cPacketizer::~cPacketizer()
 
 
 
+void cProtocol180::cPacketizer::WriteUUID(const AString & a_UUID)
+{
+	AString UUID_1 = a_UUID.substr(0, a_UUID.length() / 2);
+	AString UUID_2 = a_UUID.substr(a_UUID.length() / 2);
+	
+	UInt64 Value_1, Value_2;
+	sscanf(UUID_1.c_str(), "%llx", &Value_1);
+	sscanf(UUID_2.c_str(), "%llx", &Value_2);
+
+	WriteInt64((Int64)Value_1);
+	WriteInt64((Int64)Value_2);
+}
+
+
+
+
+
 void cProtocol180::cPacketizer::WriteItem(const cItem & a_Item)
 {
 	short ItemType = a_Item.m_ItemType;

src/Protocol/Protocol18x.h

@@ -204,6 +204,8 @@ protected:
 			m_Out.WritePosition(a_BlockX, a_BlockY, a_BlockZ);
 		}
 		
+		void WriteUUID(const AString & a_UUID);
+		
 		void WriteBuf(const char * a_Data, size_t a_Size)
 		{
 			m_Out.Write(a_Data, a_Size);