Improve mobv2

1 files changed, 34 insertions, 2 deletions

diff --git a/src/client.cpp b/src/client.cpp
index 1e81a464c..c54bf34ce 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1523,7 +1523,7 @@ void Client::groundAction(u8 action, v3s16 nodepos_undersurface,
 	Send(0, data, true);
 }
 
-void Client::clickActiveObject(u8 button, u16 id, u16 item)
+void Client::clickActiveObject(u8 button, u16 id, u16 item_i)
 {
 	if(connectedAndInitialized() == false){
 		dout_client<<DTIME<<"Client::clickActiveObject() "
@@ -1531,6 +1531,38 @@ void Client::clickActiveObject(u8 button, u16 id, u16 item)
 				<<std::endl;
 		return;
 	}
+
+	Player *player = m_env.getLocalPlayer();
+	if(player == NULL)
+		return;
+
+	ClientActiveObject *obj = m_env.getActiveObject(id);
+	if(obj){
+		if(button == 0){
+			ToolItem *titem = NULL;
+			std::string toolname = "";
+
+			InventoryList *mlist = player->inventory.getList("main");
+			if(mlist != NULL)
+			{
+				InventoryItem *item = mlist->getItem(item_i);
+				if(item && (std::string)item->getName() == "ToolItem")
+				{
+					titem = (ToolItem*)item;
+					toolname = titem->getToolName();
+				}
+			}
+
+			v3f playerpos = player->getPosition();
+			v3f objpos = obj->getPosition();
+			v3f dir = (objpos - playerpos).normalize();
+			
+			bool disable_send = obj->directReportPunch(toolname, dir);
+
+			if(disable_send)
+				return;
+		}
+	}
 	
 	/*
 		length: 7
@@ -1544,7 +1576,7 @@ void Client::clickActiveObject(u8 button, u16 id, u16 item)
 	writeU16(&data[0], TOSERVER_CLICK_ACTIVEOBJECT);
 	writeU8(&data[2], button);
 	writeU16(&data[3], id);
-	writeU16(&data[5], item);
+	writeU16(&data[5], item_i);
 	Send(0, data, true);
 }