Merge pull request #1 from TheNextLvl-net/fixes

Fixed instanceof checks and area parsing
TheNextLvl-net · Jul 6, 2024 · 05a0338 · 05a0338
2 parents d034b2b + e2f944e
commit 05a0338
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaFlagCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaFlagCommand.java
@@ -64,7 +64,7 @@ Command.Builder<CommandSourceStack> create() {
                     .optional("area",
                             StringParser.greedyStringParser(),
                             DefaultValue.dynamic(context -> {
-                                if (!(context.sender() instanceof Player player)) return "";
+                                if (!(context.sender().getSender() instanceof Player player)) return "";
                                 return plugin.areaProvider().getArea(player).getName();
                             }),
                             SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas()
@@ -155,7 +155,7 @@ Command.Builder<CommandSourceStack> create() {
                                     .map(Suggestion::suggestion)
                                     .toList()))
                     .required("value",
-                            StringParser.greedyStringParser(),
+                            StringParser.stringParser(), // temp fix // todo: allow greedy strings
                             SuggestionProvider.blocking((context, input) -> {
                                 var key = context.<NamespacedKey>get("flag");
                                 var flag = plugin.flagRegistry().getFlag(key).orElse(null);
@@ -182,7 +182,7 @@ else if (flag.type().isEnum())
                     .optional("area",
                             StringParser.greedyStringParser(),
                             DefaultValue.dynamic(context -> {
-                                if (!(context.sender() instanceof Player player)) return "";
+                                if (!(context.sender().getSender() instanceof Player player)) return "";
                                 return plugin.areaProvider().getArea(player).getName();
                             }),
                             SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas()
@@ -258,7 +258,7 @@ Command.Builder<CommandSourceStack> create() {
                     .optional("area",
                             StringParser.greedyStringParser(),
                             DefaultValue.dynamic(context -> {
-                                if (!(context.sender() instanceof Player player)) return "";
+                                if (!(context.sender().getSender() instanceof Player player)) return "";
                                 return plugin.areaProvider().getArea(player).getName();
                             }),
                             SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas()

diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaInfoCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaInfoCommand.java
@@ -32,7 +32,7 @@ Command.Builder<CommandSourceStack> create() {
                 .optional("area",
                         StringParser.greedyStringParser(),
                         DefaultValue.dynamic(context -> {
-                            if (!(context.sender() instanceof Player player)) return "";
+                            if (!(context.sender().getSender() instanceof Player player)) return "";
                             return plugin.areaProvider().getArea(player).getName();
                         }),
                         SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas()

diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaPriorityCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaPriorityCommand.java
@@ -31,7 +31,7 @@ Command.Builder<CommandSourceStack> create() {
                 .required("priority", IntegerParser.integerParser())
                 .optional("area", StringParser.greedyStringParser(),
                         DefaultValue.dynamic(context -> {
-                            if (!(context.sender() instanceof Player player)) return "";
+                            if (!(context.sender().getSender() instanceof Player player)) return "";
                             return plugin.areaProvider().getArea(player).getName();
                         }),
                         SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas()