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

use less dependencies

Browse Source
This commit is contained in:
pop4959 2018-09-04 16:53:01 -07:00
parent 3395bab928
commit 0432546746
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,9 +7,7 @@ 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.PriorityQueue;
import java.util.Queue; import java.util.Queue;
@ -87,7 +85,7 @@ 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)); Queue<User> nearbyPlayers = new PriorityQueue<>((o1, o2) -> (int) (o1.getLocation().distanceSquared(loc) - o2.getLocation().distanceSquared(loc)));
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()))) {
@ -98,17 +96,17 @@ 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) {
playerDistances.offer(new Pair<>(player, delta)); nearbyPlayers.offer(player);
} }
} }
} }
while (!playerDistances.isEmpty()) { while (!nearbyPlayers.isEmpty()) {
if (output.length() > 0) { if (output.length() > 0) {
output.append(", "); output.append(", ");
} }
Pair<User, Long> playerDistance = playerDistances.poll(); User nearbyPlayer = nearbyPlayers.poll();
output.append(playerDistance.getKey().getDisplayName()).append("§f(§4").append((long) Math.sqrt(playerDistance.getValue())).append("m§f)"); output.append(nearbyPlayer.getDisplayName()).append("§f(§4").append((long) Math.sqrt(nearbyPlayer.getLocation().distanceSquared(loc))).append("m§f)");
} }
return output.length() > 1 ? output.toString() : tl("none"); return output.length() > 1 ? output.toString() : tl("none");