fix: correct member order in ConnectionRequest class

EndstoneMC · Feb 17, 2025 · e817978 · e817978
1 parent 76f8795
commit e817978
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/bedrock/network/connection_request.h b/src/bedrock/network/connection_request.h
@@ -26,15 +26,15 @@ class ConnectionRequest {
 public:
     [[nodiscard]] Json::Value getData(const std::string &key) const
     {
-        if (certificate_ && raw_token_) {
+        if (certificate_ && certificate_->isValid() && raw_token_) {
             return raw_token_->getData().get(key, Json::nullValue);
         }
         return Json::nullValue;
     }
 
 private:
-    std::unique_ptr<UnverifiedCertificate> certificate_data_;  // +0
-    std::unique_ptr<Certificate> certificate_;                 // +8
-    std::unique_ptr<WebToken> raw_token_;                      // +16
+    std::unique_ptr<WebToken> raw_token_;                      // +0
+    std::unique_ptr<UnverifiedCertificate> certificate_data_;  // +8
+    std::unique_ptr<Certificate> certificate_;                 // +16
     SubClientId client_sub_id_;                                // +24
 };
diff --git a/src/bedrock/network/sub_client_connection_request.h b/src/bedrock/network/sub_client_connection_request.h
@@ -25,14 +25,14 @@ class SubClientConnectionRequest {
 public:
     [[nodiscard]] Json::Value getData(const std::string &key) const
     {
-        if (certificate_ && raw_token_) {
+        if (certificate_ && certificate_->isValid() && raw_token_) {
             return raw_token_->getData().get(key, Json::nullValue);
         }
         return Json::nullValue;
     }
 
 private:
+    std::unique_ptr<WebToken> raw_token_;                      // +16
     std::unique_ptr<UnverifiedCertificate> certificate_data_;  // +0
     std::unique_ptr<Certificate> certificate_;                 // +8
-    std::unique_ptr<WebToken> raw_token_;                      // +16
 };