fix: Actor.getAllEffects #1252 (#1254)

LiteLDev · May 4, 2023 · 3dd3cf3 · 3dd3cf3
1 parent 57c5d22
commit 3dd3cf3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/ScriptEngine/src/api/EntityAPI.cpp b/ScriptEngine/src/api/EntityAPI.cpp
@@ -1513,13 +1513,17 @@ Local<Value> EntityClass::getAllEffects() {
         if (!actor) {
             return Local<Value>();
         }
-        auto effects = actor->getAllEffects();
-        if (effects.size() == 0) {
+        if (!actor->getActiveEffectCount()) {
             return Local<Value>();
         }
         Local<Array> effectList = Array::newArray();
-        for (auto effect : effects)
-            effectList.add(Number::newNumber((int)effect.getId()));
+        for (unsigned int i = 0; i <= 30; i++) {
+            if (actor->getEffect(i)) {
+                effectList.add(Number::newNumber((int)i));
+            } else {
+                break;
+            }
+        }
         return effectList;
     }
     CATCH("Fail in getAllEffects!")

diff --git a/ScriptEngine/src/api/PlayerAPI.cpp b/ScriptEngine/src/api/PlayerAPI.cpp
@@ -3159,13 +3159,17 @@ Local<Value> PlayerClass::getAllEffects() {
         if (!player) {
             return Local<Value>();
         }
-        auto effects = player->getAllEffects();
-        if (effects.size() == 0) {
+        if (!player->getActiveEffectCount()) {
             return Local<Value>();
         }
         Local<Array> effectList = Array::newArray();
-        for (auto effect : effects)
-            effectList.add(Number::newNumber((int)effect.getId()));
+        for (unsigned int i = 0; i <= 30; i++) {
+            if (player->getEffect(i)) {
+                effectList.add(Number::newNumber((int)i));
+            } else {
+                break;
+            }
+        }
         return effectList;
     }
     CATCH("Fail in getAllEffects!")