Merge branch 'main' into release-0.25

MihailRis · Dec 4, 2024 · 93bf360 · 93bf360
2 parents f0a07cb + 36edad0
commit 93bf360
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/doc/en/scripting/builtins/libnetwork.md b/doc/en/scripting/builtins/libnetwork.md
@@ -39,7 +39,7 @@ The Socket class has the following methods:
 
 ```lua
 -- Sends a byte array
-socket:send(table|ByteArray)
+socket:send(table|ByteArray|str)
 
 -- Reads the received data
 socket:recv(

diff --git a/doc/ru/scripting/builtins/libnetwork.md b/doc/ru/scripting/builtins/libnetwork.md
@@ -39,7 +39,7 @@ network.tcp_connect(
 
 ```lua
 -- Отправляет массив байт
-socket:send(table|ByteArray)
+socket:send(table|ByteArray|str)
 
 -- Читает полученные данные
 socket:recv(

diff --git a/src/logic/scripting/lua/libs/libnetwork.cpp b/src/logic/scripting/lua/libs/libnetwork.cpp
@@ -87,6 +87,9 @@ static int l_send(lua::State* L) {
         connection->send(
             reinterpret_cast<char*>(bytes->data().data()), bytes->data().size()
         );
+    } else if (lua::isstring(L, 2)) {
+        auto string = lua::tolstring(L, 2);
+        connection->send(string.data(), string.length());
     }
     return 0;
 }