Merge branch 'master' of https://github.com/huoji120/csgo2_tiny_serve…

…r_plugin_system
huoji120 · Oct 19, 2023 · fe85314 · fe85314
2 parents af727ea + f5413c4
commit fe85314
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/csgo2/script_apis.cpp b/csgo2/script_apis.cpp
@@ -414,13 +414,14 @@ auto luaApi_GivePlayerWeapon(lua_State* luaVm) -> int {
     const auto playerIndex = lua_tointeger(luaVm, 1);
     const auto weaponName = lua_tostring(luaVm, 2);
     auto isSuccess = false;
-    ExcutePlayerAction(playerIndex, [&](CCSPlayerController* playerController) {
-        if (playerController->m_bPawnIsAlive() == false) {
-            return;
-        }
-        isSuccess =
-            GameWeapons::ParseWeaponCommand(playerController, weaponName);
-    });
+    if (weaponName != nullptr) {
+        ExcutePlayerAction(playerIndex, [&](CCSPlayerController* playerController) {
+            if (playerController->m_bPawnIsAlive() == false) {
+               return;
+            }
+            isSuccess = GameWeapons::ParseWeaponCommand(playerController, weaponName);
+        });
+    }
     lua_pop(luaVm, 2);
     lua_pushboolean(luaVm, isSuccess);
     return 1;