fix: fixed asCommandSender

IceBlcokMC · Jan 15, 2025 · 616717b · 616717b
1 parent cc3c6ab
commit 616717b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/lib/dts/api/permissions/Permissible.d.ts b/lib/dts/api/permissions/Permissible.d.ts
@@ -27,5 +27,5 @@ declare class Permissible {
 
     //getEffectivePermissions(): PermissionAttachmentInfo[] // TODO: PermissionAttachmentInfo
 
-    asCommandSender(): CommandSender;
+    asCommandSender(): CommandSender | undefined;
 }
diff --git a/src/api/command/CommandSenderAPI.cc b/src/api/command/CommandSenderAPI.cc
@@ -32,14 +32,16 @@ ClassDefine<CommandSenderAPI> CommandSenderAPI::builder =
         .instanceFunction("removeAttachment", &PermissibleAPI::removeAttachment)
         .instanceFunction("recalculatePermissions", &PermissibleAPI::recalculatePermissions)
         .instanceFunction("getEffectivePermissions", &PermissibleAPI::getEffectivePermissions)
-        // .instanceFunction("asCommandSender", &PermissibleAPI::getEffectivePermissions)
+        .instanceFunction("asCommandSender", &PermissibleAPI::asCommandSender)
 
         .build();
 
 
 Local<Value> CommandSenderAPI::toString(Arguments const& /* args */) { return ConvertToScriptX("<CommandSender>"); }
 
-// Local<Value> CommandSenderAPI::asCommandSender(Arguments const& /* args */) {}
+Local<Value> CommandSenderAPI::asCommandSender(Arguments const& /* args */) {
+    return CommandSenderAPI::newCommandSenderAPI(get());
+}
 
 Local<Value> CommandSenderAPI::asConsole(Arguments const& /* args */) { return Local<Value>(); }
 

diff --git a/src/api/command/CommandSenderAPI.h b/src/api/command/CommandSenderAPI.h
@@ -26,7 +26,7 @@ class CommandSenderAPI : public PermissibleAPI {
     endstone::CommandSender* get() { return mSender; }
 
     METHODS(toString);
-    // METHODS(asCommandSender);
+    METHODS(asCommandSender);
     METHODS(asConsole);
     METHODS(asActor);
     METHODS(asPlayer);

diff --git a/src/api/permissions/PermissibleAPI.cc b/src/api/permissions/PermissibleAPI.cc
@@ -26,7 +26,7 @@ ClassDefine<PermissibleAPI> PermissibleAPI::builder =
         .instanceFunction("removeAttachment", &PermissibleAPI::removeAttachment)
         .instanceFunction("recalculatePermissions", &PermissibleAPI::recalculatePermissions)
         .instanceFunction("getEffectivePermissions", &PermissibleAPI::getEffectivePermissions)
-        .instanceFunction("asCommandSender", &PermissibleAPI::getEffectivePermissions)
+        .instanceFunction("asCommandSender", &PermissibleAPI::asCommandSender)
         .build();
 
 
@@ -137,8 +137,11 @@ Local<Value> PermissibleAPI::getEffectivePermissions(Arguments const& /* args */
 
 Local<Value> PermissibleAPI::asCommandSender(Arguments const& /* args */) {
     try {
-        // TODO: CommandSender
-        return Local<Value>();
+        auto sender = this->mPermissible->asCommandSender();
+        if (!sender) {
+            return Local<Value>();
+        }
+        return CommandSenderAPI::newCommandSenderAPI(sender);
     }
     Catch;
 }