refactor: refactoring DeviceAPI to prevent crash

Author: ShrBox

src/legacy/api/DeviceAPI.cpp

@@ -7,6 +7,7 @@
 #include "mc/enums/InputMode.h"
 #include "mc/network/ConnectionRequest.h"
 #include "mc/network/ServerNetworkHandler.h"
+#include "mc/world/ActorUniqueID.h"
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/level/Level.h"
 
@@ -33,23 +34,27 @@ ClassDefine<DeviceClass> DeviceClassBuilder = defineClass<DeviceClass>("LLSE_Dev
 //////////////////// Classes ////////////////////
 
 // 生成函数
-Local<Object> DeviceClass::newDevice(Player* p) {
-    auto newp = new DeviceClass(p);
+Local<Object> DeviceClass::newDevice(ActorUniqueID& uid) {
+    auto newp = new DeviceClass(uid);
     return newp->getScriptObject();
 }
 
 // 成员函数
-void DeviceClass::setPlayer(Player* player) {
+void DeviceClass::setPlayer(ActorUniqueID& uid) {
     try {
-        id = player->getOrCreateUniqueID();
+        id = uid;
     } catch (...) {
         isValid = false;
     }
 }
 
 Player* DeviceClass::getPlayer() {
-    if (!isValid) return nullptr;
-    else return ll::service::getLevel()->getPlayer(id);
+    Player* player = ll::service::getLevel()->getPlayer(id);
+    if (!isValid || !player) {
+        return nullptr;
+    } else {
+        return player;
+    }
 }
 
 Local<Value> DeviceClass::getIP() {
@@ -85,9 +90,7 @@ Local<Value> DeviceClass::getAvgPacketLoss() {
 Local<Value> DeviceClass::getLastPing() {
     try {
         Player* player = getPlayer();
-        if (!player) {
-            return Local<Value>();
-        }
+        if (!player) return Local<Value>();
 
         return Number::newNumber(player->getNetworkStatus()->mCurrentPing);
     }
@@ -97,9 +100,7 @@ Local<Value> DeviceClass::getLastPing() {
 Local<Value> DeviceClass::getLastPacketLoss() {
     try {
         Player* player = getPlayer();
-        if (!player) {
-            return Local<Value>();
-        }
+        if (!player) return Local<Value>();
 
         return Number::newNumber(player->getNetworkStatus()->mCurrentPacketLoss);
     }
@@ -119,9 +120,8 @@ Local<Value> DeviceClass::getOs() {
 Local<Value> DeviceClass::getServerAddress() {
     try {
         Player* player = getPlayer();
-        if (!player) {
-            return Local<Value>();
-        }
+        if (!player) return Local<Value>();
+
         if (player->isSimulatedPlayer()) String::newString("unknown");
         Json::Value& requestJson = ll::service::getServerNetworkHandler()
                                        ->fetchConnectionRequest(player->getNetworkIdentifier())

src/legacy/api/DeviceAPI.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "api/APIHelp.h"
+#include "mc/deps/core/mce/UUID.h"
 #include "mc/world/ActorUniqueID.h"
 
 //////////////////// Classes ////////////////////
@@ -10,12 +11,14 @@ class DeviceClass : public ScriptClass {
     bool          isValid = true;
 
 public:
-    explicit DeviceClass(Player* p) : ScriptClass(ScriptClass::ConstructFromCpp<DeviceClass>{}) { setPlayer(p); }
+    explicit DeviceClass(ActorUniqueID& uid) : ScriptClass(ScriptClass::ConstructFromCpp<DeviceClass>{}) {
+        setPlayer(uid);
+    }
 
-    void    setPlayer(Player* player);
+    void    setPlayer(ActorUniqueID& uid);
     Player* getPlayer();
 
-    static Local<Object> newDevice(Player* p);
+    static Local<Object> newDevice(ActorUniqueID& uid);
 
     Local<Value> getIP();
     Local<Value> getAvgPing();

src/legacy/api/PlayerAPI.cpp

@@ -2033,10 +2033,7 @@ Local<Value> PlayerClass::getBlockStandingOn(const Arguments& args) {
 
 Local<Value> PlayerClass::getDevice(const Arguments& args) {
     try {
-        Player* player = get();
-        if (!player) return Local<Value>();
-
-        return DeviceClass::newDevice(player);
+        return DeviceClass::newDevice(id);
     }
     CATCH("Fail in getDevice!");
 }