EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-04-03 01:56:24 +02:00
Code Issues Projects Releases Wiki Activity

chore: don't filter on base-plot twice

Browse Source
This commit is contained in:
Pierre Maurice Schwang 2025-02-22 21:36:17 +01:00
parent 60f81c4732
commit 36de196d3d
No known key found for this signature in database
GPG Key ID: 37E613079F3E5BB9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Core/src/main/java/com/plotsquared/core/command/Visit.java
View File

@ -67,9 +67,10 @@ public class Visit extends Command {
private void visit( private void visit(
final @NonNull PlotPlayer<?> player, final @NonNull PlotQuery query, final PlotArea sortByArea, final @NonNull PlotPlayer<?> player, final @NonNull PlotQuery query, final PlotArea sortByArea,
final RunnableVal3<Command, Runnable, Runnable> confirm, final RunnableVal2<Command, CommandResult> whenDone, int page final RunnableVal3<Command, Runnable, Runnable> confirm, final RunnableVal2<Command, CommandResult> whenDone,
int page, final boolean isQueryingBasePlot
) { ) {
if (query.hasMinimumMatches(2)) { if (!isQueryingBasePlot && query.hasMinimumMatches(2)) {
query.whereBasePlot(); query.whereBasePlot();
} }
@ -233,7 +234,8 @@ public class Visit extends Command {
finalSortByArea, finalSortByArea,
confirm, confirm,
whenDone, whenDone,
finalPage1 finalPage1,
true
); );
} }
}); });
@ -268,7 +270,8 @@ public class Visit extends Command {
player.getApplicablePlotArea(), player.getApplicablePlotArea(),
confirm, confirm,
whenDone, whenDone,
1 1,
false
); );
} else { } else {
player.sendMessage( player.sendMessage(
@ -286,13 +289,13 @@ public class Visit extends Command {
player.sendMessage(TranslatableCaption.of("errors.player_no_plots")); player.sendMessage(TranslatableCaption.of("errors.player_no_plots"));
return; return;
} }
this.visit(player, query.whereBasePlot(), null, confirm, whenDone, finalPage); this.visit(player, query.whereBasePlot(), null, confirm, whenDone, finalPage, true);
}); });
} else { } else {
// Try to parse a plot // Try to parse a plot
final Plot plot = Plot.getPlotFromString(player, finalArgs[0], true); final Plot plot = Plot.getPlotFromString(player, finalArgs[0], true);
if (plot != null) { if (plot != null) {
this.visit(player, PlotQuery.newQuery().withPlot(plot), null, confirm, whenDone, 1); this.visit(player, PlotQuery.newQuery().withPlot(plot), null, confirm, whenDone, 1, false);
} }
} }
break; break;