Adding network msg to network msg

src/luascript.cpp

@@ -2527,6 +2527,7 @@ void LuaScriptInterface::registerFunctions()
 	registerMethod(L, "NetworkMessage", "addDouble", LuaScriptInterface::luaNetworkMessageAddDouble);
 	registerMethod(L, "NetworkMessage", "addItem", LuaScriptInterface::luaNetworkMessageAddItem);
 	registerMethod(L, "NetworkMessage", "addItemId", LuaScriptInterface::luaNetworkMessageAddItemId);
+	registerMethod(L, "NetworkMessage", "addNetworkMessage", LuaScriptInterface::luaNetworkMessageAddNetworkMessage);
 
 	registerMethod(L, "NetworkMessage", "reset", LuaScriptInterface::luaNetworkMessageReset);
 	registerMethod(L, "NetworkMessage", "seek", LuaScriptInterface::luaNetworkMessageSeek);
@@ -6293,6 +6294,26 @@ int LuaScriptInterface::luaNetworkMessageAddItemId(lua_State* L)
 	return 1;
 }
 
+int LuaScriptInterface::luaNetworkMessageAddNetworkMessage(lua_State* L)
+{
+	// networkMessage:addNetworkMessage(msg)
+	NetworkMessage* message = tfs::lua::getUserdata<NetworkMessage>(L, 1);
+	if (!message) {
+		lua_pushnil(L);
+		return 1;
+	}
+
+	NetworkMessage* msgToAdd = tfs::lua::getUserdata<NetworkMessage>(L, 2);
+	if (!msgToAdd) {
+		lua_pushnil(L);
+		return 1;
+	}
+
+	message->addNetworkMessage(msgToAdd);
+	tfs::lua::pushBoolean(L, true);
+	return 1;
+}
+
 int LuaScriptInterface::luaNetworkMessageReset(lua_State* L)
 {
 	// networkMessage:reset()

src/luascript.h

@@ -395,6 +395,7 @@ class LuaScriptInterface
 	static int luaNetworkMessageAddDouble(lua_State* L);
 	static int luaNetworkMessageAddItem(lua_State* L);
 	static int luaNetworkMessageAddItemId(lua_State* L);
+	static int luaNetworkMessageAddNetworkMessage(lua_State* L);
 
 	static int luaNetworkMessageReset(lua_State* L);
 	static int luaNetworkMessageSeek(lua_State* L);

src/networkmessage.cpp

@@ -191,3 +191,19 @@ void NetworkMessage::addItem(const Item* item)
 }
 
 void NetworkMessage::addItemId(uint16_t itemId) { add<uint16_t>(Item::items[itemId].clientId); }
+
+void NetworkMessage::addNetworkMessage(NetworkMessage* networkMsg)
+{
+	if (!networkMsg) {
+		return;
+	}
+
+	if (!canAdd(networkMsg->getLength())) {
+		return;
+	}
+
+	std::memcpy(buffer.data() + info.position, networkMsg->getBuffer() + INITIAL_BUFFER_POSITION,
+	            networkMsg->getLength());
+	info.position += networkMsg->getLength();
+	info.length += networkMsg->getLength();
+}

src/networkmessage.h

@@ -111,6 +111,7 @@ class NetworkMessage
 	void addItem(uint16_t id, uint8_t count);
 	void addItem(const Item* item);
 	void addItemId(uint16_t itemId);
+	void addNetworkMessage(NetworkMessage* networkMsg);
 
 	MsgSize_t getLength() const { return info.length; }