Merge pull request #334 from eesast/dev

v1.0.3
eesast · May 8, 2024 · 6789a92 · 6789a92
2 parents 7288ca7 + 30b3530
commit 6789a92
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/CAPI/cpp/API/src/Communication.cpp b/CAPI/cpp/API/src/Communication.cpp
@@ -227,18 +227,14 @@ bool Communication::Recycle(int32_t playerID, int32_t teamID)
 
 bool Communication::TryConnection(int32_t playerID, int32_t teamID)
 {
-    constexpr int maxRetryNum = 10;
+    protobuf::BoolRes reply;
+    ClientContext context;
     auto request = THUAI72Proto::THUAI72ProtobufIDMsg(playerID, teamID);
-    for (int retryNum = 0; retryNum < maxRetryNum; retryNum++)
-    {
-        protobuf::BoolRes reply;
-        ClientContext context;
-        std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-        auto status = THUAI7Stub->TryConnection(&context, request, &reply);
-        if (status.ok())
-            return true;
-    }
-    return false;
+    auto status = THUAI7Stub->TryConnection(&context, request, &reply);
+    if (status.ok())
+        return true;
+    else
+        return false;
 }
 
 void Communication::AddPlayer(int32_t playerID, int32_t teamID, THUAI7::ShipType ShipType)

diff --git a/CAPI/python/PyAPI/Communication.py b/CAPI/python/PyAPI/Communication.py
@@ -235,18 +235,14 @@ def BuildShip(
             return buildResult.act_success
 
     def TryConnection(self, playerID: int, teamID: int) -> bool:
-        maxRetryNum: int = 10
-        for _ in range(maxRetryNum):
-            try:
-                time.sleep(1)
-                tryResult: Message2Clients.BoolRes = self.__THUAI7Stub.TryConnection(
-                    THUAI72Proto.THUAI72ProtobufIDMsg(playerID, teamID)
-                )
-            except grpc.RpcError:
-                continue
-            else:
-                return tryResult.act_success
-        return False
+        try:
+            tryResult: Message2Clients.BoolRes = self.__THUAI7Stub.TryConnection(
+                THUAI72Proto.THUAI72ProtobufIDMsg(playerID, teamID)
+            )
+        except grpc.RpcError:
+            return False
+        else:
+            return tryResult.act_success
 
     def GetMessage2Client(self) -> Message2Clients.MessageToClient:
         with self.__cvMessage: