From 41af67501c58b02f31c745ca4b1ab1656c55398e Mon Sep 17 00:00:00 2001
From: Bananababooy <48812049+bananababoo@users.noreply.github.com>
Date: Mon, 23 Mar 2026 00:45:23 -0500
Subject: [PATCH] Fix CloudCommandSender incorrectly getting the sender entity
 / player

---
 .../java/com/dfsek/terra/bukkit/CloudCommandSender.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java
index 0160180a9..9a08402b4 100644
--- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java
+++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java
@@ -25,15 +25,15 @@ public class CloudCommandSender implements CommandSender {
 
     @Override
     public Optional<Entity> getEntity() {
-        if(delegate instanceof org.bukkit.entity.Entity entity) {
-            return Optional.of(BukkitAdapter.adapt(entity));
+        if(delegate.getExecutor() != null) {
+            return Optional.of(BukkitAdapter.adapt(delegate.getExecutor()));
         }
         return Optional.empty();
     }
 
     @Override
     public Optional<Player> getPlayer() {
-        if(delegate instanceof org.bukkit.entity.Player player) {
+        if(delegate.getSender() instanceof org.bukkit.entity.Player player) {
             return Optional.of(BukkitAdapter.adapt(player));
         }
         return Optional.empty();