fix commandsender thing

Author: HashimTheArab

packages/php/src/Commands/CommandSender.php

@@ -2,17 +2,10 @@
 
 namespace Dragonfly\PluginLib\Commands;
 
-use Df\Plugin\WorldRef;
-use Dragonfly\PluginLib\Actions\Actions;
-use Dragonfly\PluginLib\Entity\Player;
-
-class CommandSender extends Player {
-    public function __construct(
-        public string $uuid,
-        public string $name,
-        Actions $actions,
-        ?WorldRef $world = null,
-    ) {
-        parent::__construct($uuid, $name, $actions, $world);
-    }
+/**
+ * Interface for anything that can execute commands (players, console, etc.)
+ */
+interface CommandSender {
+    public function sendMessage(string $message): void;
+    public function getName(): string;
 }

packages/php/src/Entity/Player.php

@@ -6,8 +6,9 @@
 use Df\Plugin\Vec3;
 use Df\Plugin\WorldRef;
 use Dragonfly\PluginLib\Actions\Actions;
+use Dragonfly\PluginLib\Commands\CommandSender;
 
-final class Player {
+final class Player implements CommandSender {
     public function __construct(
         private string $uuid,
         private string $name,

packages/php/src/Events/EventContext.php

@@ -5,7 +5,6 @@
 use Df\Plugin\EventResult;
 use Dragonfly\PluginLib\Actions\Actions;
 use Dragonfly\PluginLib\Actions\ActionsTrait;
-use Dragonfly\PluginLib\Commands\CommandSender;
 use Dragonfly\PluginLib\Entity\Player;
 use Dragonfly\PluginLib\Server\Server;
 use Dragonfly\PluginLib\StreamSender;
@@ -93,9 +92,8 @@ public function player(string $uuid, string $name = ''): Player {
         return new Player($uuid, $name, $this->getActions());
     }
 
-    public function commandSender(string $uuid, string $name): CommandSender {
-        $world = $this->server->getPlayerWorld($uuid);
-        return new CommandSender($uuid, $name, $this->getActions(), $world);
+    public function commandSender(string $uuid): ?Player {
+        return $this->server->getPlayer($uuid);
     }
 
     /**

packages/php/src/PluginBase.php

@@ -478,9 +478,11 @@ private function ensureCommandHandler(): void {
             $cmd = clone $template;
 
             $senderUuid = $cmdEvt->getPlayerUuid();
-            $senderName = $cmdEvt->getName();
             $ctx = new EventContext($this->pluginId, $eventId, $this->sender, $this->server, $event->getExpectsResponse());
-            $sender = $ctx->commandSender($senderUuid, $senderName);
+            $sender = $ctx->commandSender($senderUuid);
+            if ($sender === null) {
+                return;
+            }
 
             try {
                 $argsField = $cmdEvt->getArgs();