diff --git a/client/src/bindings/Player.cpp b/client/src/bindings/Player.cpp index 1ffc7450..72bfbb74 100644 --- a/client/src/bindings/Player.cpp +++ b/client/src/bindings/Player.cpp @@ -210,6 +210,7 @@ extern V8Class v8Player("Player", V8Helpers::SetAccessor(isolate, tpl, "isOnLadder"); V8Helpers::SetAccessor(isolate, tpl, "isInMelee"); V8Helpers::SetAccessor(isolate, tpl, "isInCover"); + V8Helpers::SetAccessor(isolate, tpl, "isParachuting"); // V8Helpers::SetAccessor(isolate, tpl, "isSuperJumpEnabled"); // V8Helpers::SetAccessor(isolate, tpl, "isCrouching"); diff --git a/server/src/bindings/Player.cpp b/server/src/bindings/Player.cpp index 24b67768..c077c2e6 100644 --- a/server/src/bindings/Player.cpp +++ b/server/src/bindings/Player.cpp @@ -856,26 +856,27 @@ static void RequestCloudID(const v8::FunctionCallbackInfo& info) auto& persistent = promises.emplace_back(v8::Global(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(isolate, tpl, "isOnLadder"); V8Helpers::SetAccessor(isolate, tpl, "isInMelee"); V8Helpers::SetAccessor(isolate, tpl, "isInCover"); + V8Helpers::SetAccessor(isolate, tpl, "isParachuting"); V8Helpers::SetAccessor(isolate, tpl, "currentAnimationDict"); V8Helpers::SetAccessor(isolate, tpl, "currentAnimationName"); diff --git a/shared/deps/cpp-sdk b/shared/deps/cpp-sdk index 8d8e0cd9..d31984df 160000 --- a/shared/deps/cpp-sdk +++ b/shared/deps/cpp-sdk @@ -1 +1 @@ -Subproject commit 8d8e0cd9b383883da3d767d632580decd09e3738 +Subproject commit d31984dfb3ef053a3a4c3ed10411e17a268fcbf8