shared: add isParachuting player getter

altmp · Aug 15, 2023 · 7b8231a · 7b8231a
1 parent f981d07
commit 7b8231a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/client/src/bindings/Player.cpp b/client/src/bindings/Player.cpp
@@ -210,6 +210,7 @@ extern V8Class v8Player("Player",
                             V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsOnLadder>(isolate, tpl, "isOnLadder");
                             V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsInMelee>(isolate, tpl, "isInMelee");
                             V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsInCover>(isolate, tpl, "isInCover");
+                            V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsParachuting>(isolate, tpl, "isParachuting");
 
                             // V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsSuperJumpEnabled>(isolate, tpl, "isSuperJumpEnabled");
                             // V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsCrouching>(isolate, tpl, "isCrouching");

diff --git a/server/src/bindings/Player.cpp b/server/src/bindings/Player.cpp
@@ -856,26 +856,27 @@ static void RequestCloudID(const v8::FunctionCallbackInfo<v8::Value>& info)
 
     auto& persistent = promises.emplace_back(v8::Global<v8::Promise::Resolver>(isolate, v8::Promise::Resolver::New(ctx).ToLocalChecked()));
 
-    player->RequestCloudID([&persistent, resource](bool ok, const std::string& result) {
-        resource->RunOnNextTick(
-          [=, &persistent, &resource]()
-          {
-              if(!resource->GetResource()->IsStarted())
-              {
-                  promises.remove(persistent);
-                  return;
-              }
-
-              auto isolate = resource->GetIsolate();
-              auto context = resource->GetContext();
-
-              if (ok)
-                  persistent.Get(isolate)->Resolve(context, V8Helpers::JSValue(result));
-              else
-                  persistent.Get(isolate)->Reject(context, v8::Exception::Error(V8Helpers::JSValue(result)));
-              promises.remove(persistent);
-          });
-    });
+    player->RequestCloudID(
+      [&persistent, resource](bool ok, const std::string& result)
+      {
+          resource->RunOnNextTick(
+            [=, &persistent, &resource]()
+            {
+                if(!resource->GetResource()->IsStarted())
+                {
+                    promises.remove(persistent);
+                    return;
+                }
+
+                auto isolate = resource->GetIsolate();
+                auto context = resource->GetContext();
+
+                if(ok) persistent.Get(isolate)->Resolve(context, V8Helpers::JSValue(result));
+                else
+                    persistent.Get(isolate)->Reject(context, v8::Exception::Error(V8Helpers::JSValue(result)));
+                promises.remove(persistent);
+            });
+      });
 
     V8_RETURN(persistent.Get(isolate)->GetPromise());
 }
@@ -1437,6 +1438,7 @@ extern V8Class v8Player("Player",
                             V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsOnLadder>(isolate, tpl, "isOnLadder");
                             V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsInMelee>(isolate, tpl, "isInMelee");
                             V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsInCover>(isolate, tpl, "isInCover");
+                            V8Helpers::SetAccessor<IPlayer, bool, &IPlayer::IsParachuting>(isolate, tpl, "isParachuting");
 
                             V8Helpers::SetAccessor<IPlayer, uint32_t, &IPlayer::GetCurrentAnimationDict>(isolate, tpl, "currentAnimationDict");
                             V8Helpers::SetAccessor<IPlayer, uint32_t, &IPlayer::GetCurrentAnimationName>(isolate, tpl, "currentAnimationName");

diff --git a/shared/deps/cpp-sdk b/shared/deps/cpp-sdk