Quick dumb fix

VelixDevelopments · Oct 16, 2024 · e346961 · e346961
1 parent 667d6ba
commit e346961
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/bukkit/src/main/java/dev/velix/imperat/type/ParameterOfflinePlayer.java b/bukkit/src/main/java/dev/velix/imperat/type/ParameterOfflinePlayer.java
@@ -42,8 +42,9 @@ public ParameterOfflinePlayer() {
         ExecutionContext<BukkitSource> context,
         @NotNull CommandInputStream<BukkitSource> commandInputStream
     ) throws ImperatException {
-        String name = commandInputStream.currentRaw();
+        String name = commandInputStream.currentRaw().orElse(null);
         if (name == null) return null;
+
         if (name.length() > 16) {
             throw new UnknownPlayerException(name);
         }
@@ -67,7 +68,7 @@ public ParameterOfflinePlayer() {
 
     @Override
     public boolean matchesInput(String input, CommandParameter<BukkitSource> parameter) {
-        return input.length() <= 16; //TODO impl other logic
+        return input.length() <= 16;
     }
 
 

diff --git a/bukkit/src/main/java/dev/velix/imperat/type/ParameterPlayer.java b/bukkit/src/main/java/dev/velix/imperat/type/ParameterPlayer.java
@@ -26,8 +26,9 @@ public ParameterPlayer() {
         ExecutionContext<BukkitSource> context,
         @NotNull CommandInputStream<BukkitSource> commandInputStream
     ) throws ImperatException {
-        String raw = commandInputStream.currentRaw();
+        String raw = commandInputStream.currentRaw().orElse(null);
         if (raw == null) return null;
+
         if (raw.equalsIgnoreCase("me")) {
             if (context.source().isConsole()) {
                 throw new UnknownPlayerException(raw);

diff --git a/bukkit/src/main/java/dev/velix/imperat/type/ParameterTargetSelector.java b/bukkit/src/main/java/dev/velix/imperat/type/ParameterTargetSelector.java
@@ -34,10 +34,13 @@ private ParameterTargetSelector() {
         @NotNull CommandInputStream<BukkitSource> commandInputStream
     ) throws ImperatException {
 
-        String raw = commandInputStream.currentRaw();
+        String raw = commandInputStream.currentRaw().orElse(null);
+        if (raw == null)
+            return TargetSelector.of();
+
         char last = raw.charAt(raw.length() - 1);
 
-        if (commandInputStream.currentLetter() != SelectionType.MENTION_CHARACTER) {
+        if (commandInputStream.currentLetter().filter((c) -> c != SelectionType.MENTION_CHARACTER).isPresent()) {
             Player target = Bukkit.getPlayer(raw);
             if (target == null)
                 return TargetSelector.of();

diff --git a/bukkit/src/main/java/dev/velix/imperat/type/ParameterWorld.java b/bukkit/src/main/java/dev/velix/imperat/type/ParameterWorld.java
@@ -43,7 +43,7 @@ public ParameterWorld() {
 
     @Override
     public @Nullable World resolve(ExecutionContext<BukkitSource> context, @NotNull CommandInputStream<BukkitSource> commandInputStream) throws ImperatException {
-        String raw = commandInputStream.currentRaw();
+        String raw = commandInputStream.currentRaw().orElse(null);
         if (raw == null) return null;
 
         World world = Bukkit.getWorld(raw.toLowerCase());

diff --git a/bungee/src/main/java/dev/velix/imperat/type/ParameterProxiedPlayer.java b/bungee/src/main/java/dev/velix/imperat/type/ParameterProxiedPlayer.java
@@ -26,7 +26,7 @@ public ParameterProxiedPlayer() {
         ExecutionContext<BungeeSource> context,
         @NotNull CommandInputStream<BungeeSource> commandInputStream
     ) throws ImperatException {
-        String currentRaw = commandInputStream.currentRaw();
+        String currentRaw = commandInputStream.currentRaw().orElse(null);
         if (currentRaw == null) return null;
 
         if (currentRaw.equalsIgnoreCase("me")) {

diff --git a/velocity/src/main/java/dev/velix/imperat/types/ParameterPlayer.java b/velocity/src/main/java/dev/velix/imperat/types/ParameterPlayer.java
@@ -29,7 +29,7 @@ public ParameterPlayer(ProxyServer server) {
         ExecutionContext<VelocitySource> context,
         @NotNull CommandInputStream<VelocitySource> commandInputStream
     ) throws ImperatException {
-        String currentRaw = commandInputStream.currentRaw();
+        String currentRaw = commandInputStream.currentRaw().orElse(null);
         if (currentRaw == null) return null;
 
         if (currentRaw.equalsIgnoreCase("me")) {