Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-18 00:25:32 +01:00
Code Issues Projects Releases Wiki Activity

Sort /near by nearest player.

Browse Source
This commit is contained in:
pop4959 2018-09-02 23:09:22 -07:00
parent a3eb58724f
commit 3395bab928
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Essentials/src/com/earth2me/essentials/commands/Commandnear.java
View File

@ -7,8 +7,12 @@ import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import javafx.util.Pair;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.PriorityQueue;
import java.util.Queue;
import static com.earth2me.essentials.I18n.tl; import static com.earth2me.essentials.I18n.tl;
@ -83,6 +87,8 @@ public class Commandnear extends EssentialsCommand {
final long radiusSquared = radius * radius; final long radiusSquared = radius * radius;
boolean showHidden = user.canInteractVanished(); boolean showHidden = user.canInteractVanished();
Queue<Pair<User, Long>> playerDistances = new PriorityQueue<>(Comparator.comparingLong(Pair::getValue));
for (User player : ess.getOnlineUsers()) { for (User player : ess.getOnlineUsers()) {
if (!player.equals(user) && (!player.isHidden(user.getBase()) || showHidden || user.getBase().canSee(player.getBase()))) { if (!player.equals(user) && (!player.isHidden(user.getBase()) || showHidden || user.getBase().canSee(player.getBase()))) {
final Location playerLoc = player.getLocation(); final Location playerLoc = player.getLocation();
@ -92,13 +98,19 @@ public class Commandnear extends EssentialsCommand {
final long delta = (long) playerLoc.distanceSquared(loc); final long delta = (long) playerLoc.distanceSquared(loc);
if (delta < radiusSquared) { if (delta < radiusSquared) {
if (output.length() > 0) { playerDistances.offer(new Pair<>(player, delta));
output.append(", ");
}
output.append(player.getDisplayName()).append("§f(§4").append((long) Math.sqrt(delta)).append("m§f)");
} }
} }
} }
while (!playerDistances.isEmpty()) {
if (output.length() > 0) {
output.append(", ");
}
Pair<User, Long> playerDistance = playerDistances.poll();
output.append(playerDistance.getKey().getDisplayName()).append("§f(§4").append((long) Math.sqrt(playerDistance.getValue())).append("m§f)");
}
return output.length() > 1 ? output.toString() : tl("none"); return output.length() > 1 ? output.toString() : tl("none");
} }