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

chore/feat: don't query full plot list twice

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

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

@ -69,11 +69,7 @@ public class Visit extends Command {
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
) { ) {
// We get the query once, if (query.hasMinimumMatches(2)) {
// then we get it another time further on
final List<Plot> unsorted = query.asList();
if (unsorted.size() > 1) {
query.whereBasePlot(); query.whereBasePlot();
} }
@ -261,12 +257,9 @@ public class Visit extends Command {
if (throwable instanceof TimeoutException) { if (throwable instanceof TimeoutException) {
// The request timed out // The request timed out
player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout")); player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
} else if (uuid != null && (Settings.Teleport.VISIT_MERGED_OWNERS return;
? !PlotQuery.newQuery().ownersInclude(uuid).anyMatch() }
: !PlotQuery.newQuery().ownedBy(uuid).anyMatch())) { if (uuid == null){
// It was a valid UUID but the player has no plots
player.sendMessage(TranslatableCaption.of("errors.player_no_plots"));
} else if (uuid == null) {
// player not found, so we assume it's an alias if no page was provided // player not found, so we assume it's an alias if no page was provided
if (finalPage == Integer.MIN_VALUE) { if (finalPage == Integer.MIN_VALUE) {
this.visit( this.visit(
@ -283,18 +276,17 @@ public class Visit extends Command {
TagResolver.resolver("value", Tag.inserting(Component.text(finalArgs[0]))) TagResolver.resolver("value", Tag.inserting(Component.text(finalArgs[0])))
); );
} }
} else { return;
this.visit(
player,
Settings.Teleport.VISIT_MERGED_OWNERS
? PlotQuery.newQuery().ownersInclude(uuid).whereBasePlot()
: PlotQuery.newQuery().ownedBy(uuid).whereBasePlot(),
null,
confirm,
whenDone,
finalPage
);
} }
final PlotQuery query = Settings.Teleport.VISIT_MERGED_OWNERS
? PlotQuery.newQuery().ownersInclude(uuid)
: PlotQuery.newQuery().ownedBy(uuid);
if (!query.anyMatch()) {
// It was a valid UUID but the player has no plots
player.sendMessage(TranslatableCaption.of("errors.player_no_plots"));
return;
}
this.visit(player, query.whereBasePlot(), null, confirm, whenDone, finalPage);
}); });
} else { } else {
// Try to parse a plot // Try to parse a plot