SpigotCommandSender: Added handle getters

xDec0de · Nov 27, 2024 · 0b74f17 · 0b74f17
1 parent 3b4b689
commit 0b74f17
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/platforms/spigot/src/main/java/net/codersky/mcutils/spigot/cmd/SpigotCommandSender.java b/platforms/spigot/src/main/java/net/codersky/mcutils/spigot/cmd/SpigotCommandSender.java
@@ -7,6 +7,7 @@
 import net.codersky.mcutils.spigot.SpigotUtils;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -30,6 +31,12 @@ public boolean isPlayer() {
 		return sender instanceof Player;
 	}
 
+	@Nullable
+	@Override
+	public Player asPlayerHandle() {
+		return sender instanceof Player player ? player : null;
+	}
+
 	@Nullable
 	@Override
 	public MCPlayer asPlayer() {
@@ -40,6 +47,12 @@ public MCPlayer asPlayer() {
 	 * Console related
 	 */
 
+	@Nullable
+	@Override
+	public ConsoleCommandSender asConsoleHandle() {
+		return sender instanceof ConsoleCommandSender console ? console : null;
+	}
+
 	@Nullable
 	@Override
 	public SpigotConsole asConsole() {

diff --git a/shared/src/main/java/net/codersky/mcutils/cmd/MCCommandSender.java b/shared/src/main/java/net/codersky/mcutils/cmd/MCCommandSender.java
@@ -10,7 +10,7 @@
 public interface MCCommandSender extends MessageReceiver {
 
 	/*
-	 * Player related
+	 - Player related
 	 */
 
 	boolean isPlayer();
@@ -25,7 +25,7 @@ default Object asPlayerHandle() {
 	}
 
 	/*
-	 * Console related
+	 - Console related
 	 */
 
 	default boolean isConsole() {
@@ -42,11 +42,15 @@ default Object asConsoleHandle() {
 	}
 
 	/*
-	 * Utilities
+	 - Shared methods
 	 */
 
 	boolean hasPermission(@NotNull String permission);
 
+	/*
+	 - Utilities
+	 */
+
 	@NotNull
 	MCUtils<?> getUtils();
 }