fix: fix #94

Author: ShrBox

src/legacy/api/MoreGlobal.cpp

@@ -4,20 +4,20 @@
 #include "mc/world/level/storage/DBStorage.h"
 #include "mc/world/level/storage/DBStorageConfig.h"
 
+DBStorage* MoreGlobal::db;
+
 LL_TYPE_INSTANCE_HOOK(
     DBStorageHook,
     HookPriority::Normal,
     DBStorage,
     "??0DBStorage@@QEAA@UDBStorageConfig@@V?$not_null@V?$NonOwnerPointer@VLevelDbEnv@@@Bedrock@@@gsl@@@Z",
-    DBStorage,
+    DBStorage*,
     struct DBStorageConfig&                        cfg,
     Bedrock::NotNullNonOwnerPtr<class LevelDbEnv>& dbEnv
 ) {
-    DBStorage ori = origin(cfg, dbEnv);
-    MoreGlobal::setDBStorage(&ori);
+    DBStorage* ori = origin(cfg, dbEnv);
+    MoreGlobal::db = ori;
     return ori;
 };
 
 void MoreGlobal::Init() { DBStorageHook::hook(); }
-
-DBStorage* MoreGlobal::db = nullptr;

src/legacy/api/MoreGlobal.h

@@ -1,10 +1,5 @@
 class DBStorage;
-class MoreGlobal {
-private:
-    static DBStorage* db;
-
-public:
-    static void       Init();
-    static DBStorage* getDBStorage() { return db; };
-    static void       setDBStorage(DBStorage* dbs) { db = dbs; };
-};
+namespace MoreGlobal {
+extern DBStorage* db;
+extern void       Init();
+}; // namespace MoreGlobal

src/legacy/api/PlayerAPI.cpp

@@ -330,28 +330,32 @@ Local<Value> McClass::getPlayerNbt(const Arguments& args) {
     CHECK_ARGS_COUNT(args, 1);
     CHECK_ARG_TYPE(args[0], ValueKind::kString);
     try {
-        auto         uuid   = mce::UUID::fromString(args[0].asString().toString());
-        CompoundTag* tag    = new CompoundTag();
-        Player*      player = ll::service::getLevel()->getPlayer(uuid);
+        auto                         uuid   = mce::UUID::fromString(args[0].asString().toString());
+        std::unique_ptr<CompoundTag> tag    = std::make_unique<CompoundTag>();
+        Player*                      player = ll::service::getLevel()->getPlayer(uuid);
         if (player) {
             player->save(*tag);
         } else {
-            DBStorage* db = MoreGlobal::getDBStorage();
+            DBStorage* db = MoreGlobal::db;
             if (db) {
-                auto tagPtr = db->loadPlayerDataFromTag(uuid.asString());
-                if (tagPtr) {
-                    tag = std::move(tagPtr.get());
+                if (db->hasKey("player_" + uuid.asString(), DBHelpers::Category::Player)) {
+                    std::unique_ptr<CompoundTag> playerTag =
+                        db->getCompoundTag("player_" + uuid.asString(), DBHelpers::Category::Player);
+                    if (playerTag) {
+                        std::string serverId = playerTag->at("ServerId");
+                        if (!serverId.empty()) {
+                            if (db->hasKey(serverId, DBHelpers::Category::Player)) {
+                                tag = db->getCompoundTag(serverId, DBHelpers::Category::Player);
+                            }
+                        }
+                    }
                 }
-            } else {
-                return Local<Value>();
             }
         }
-
-        if (!tag->isEmpty()) {
-            return NbtCompoundClass::pack(tag);
-        } else {
-            return Local<Value>();
+        if (tag && !tag->isEmpty()) {
+            return NbtCompoundClass::pack(std::move(tag));
         }
+        return Local<Value>();
     }
     CATCH("Fail in getPlayerNbt!")
 }

xmake.lua

@@ -9,7 +9,7 @@ add_requires(
     "legacymoney 0.5.0",
     "legacyparticleapi 0.5.0",
     "legacyremotecall 0.5.0",
-    "levilamina 0.10.2",
+    "levilamina 0.10.5",
     "lightwebsocketclient",
     "magic_enum",
     "nlohmann_json",