Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-04 16:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually add Player as a field to the commands

Browse Source
This commit is contained in:
Telesphoreo
2022-02-03 22:01:30 -06:00
parent fe53f5c49f
commit 081a702c70
25 changed files with 81 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/dev/plex/command/PlexCommand.java
View File

@ -28,10 +28,13 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandMap;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginIdentifiableCommand;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public abstract class PlexCommand extends Command
public abstract class PlexCommand extends Command implements PluginIdentifiableCommand
{
protected static Plex plugin = Plex.get();
@ -61,7 +64,7 @@ public abstract class PlexCommand extends Command
getMap().register("plex", this);
}
protected abstract Component execute(CommandSender sender, String[] args);
protected abstract Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, @NotNull String[] args);
@Override
@ -113,7 +116,7 @@ public abstract class PlexCommand extends Command
}
try
{
Component component = this.execute(sender, args);
Component component = this.execute(sender, isConsole(sender) ? null : (Player)sender, args);
if (component != null)
{
send(sender, component);
@ -237,6 +240,12 @@ public abstract class PlexCommand extends Command
return player.getUniqueId();
}
@Override
public @NotNull Plugin getPlugin()
{
return plugin;
}
protected boolean isConsole(CommandSender sender)
{