Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-10-31 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1768

Browse Source
This commit is contained in:
Jesse Boyd 2018-06-09 06:20:31 +10:00
parent dc5fc5af47
commit 9ed5847c0a
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java
View File

@ -1,10 +1,12 @@
package com.plotsquared.sponge.util; package com.plotsquared.sponge.util;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.commands.MainCommand; import com.intellectualcrafters.plot.commands.MainCommand;
import com.intellectualcrafters.plot.object.ConsolePlayer; import com.intellectualcrafters.plot.object.ConsolePlayer;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.UUIDHandler;
import com.plotsquared.sponge.SpongeMain; import com.plotsquared.sponge.SpongeMain;
import org.spongepowered.api.command.CommandCallable; import org.spongepowered.api.command.CommandCallable;
import org.spongepowered.api.command.CommandException; import org.spongepowered.api.command.CommandException;
@ -15,12 +17,7 @@ import org.spongepowered.api.text.Text;
import org.spongepowered.api.world.Location; import org.spongepowered.api.world.Location;
import org.spongepowered.api.world.World; import org.spongepowered.api.world.World;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
public class SpongeCommand implements CommandCallable { public class SpongeCommand implements CommandCallable {
@ -56,14 +53,22 @@ public class SpongeCommand implements CommandCallable {
return Collections.singletonList(MainCommand.getInstance().toString()); return Collections.singletonList(MainCommand.getInstance().toString());
} }
Collection objects = MainCommand.getInstance().tab(player, args, arguments.endsWith(" ")); Collection objects = MainCommand.getInstance().tab(player, args, arguments.endsWith(" "));
if (objects == null) { if (objects != null && !objects.isEmpty()) {
return ImmutableList.of(); List<String> result = new ArrayList<>();
for (Object o : objects) {
result.add(o.toString());
}
return result;
} }
List<String> result = new ArrayList<>(); List<String> names = new ArrayList<>();
for (Object o : objects) { String startsWith = arguments.endsWith(" ") ? "" : args[args.length - 1];
result.add(o.toString()); for (Map.Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
String name = entry.getKey();
if (name.startsWith(startsWith)) {
names.add(name);
}
} }
return result; return names;
} }
@Override @Override