From 9605ac5ded7013f6edfc88e72f3f7d2616397b11 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 2 Oct 2021 14:58:14 +0200 Subject: [PATCH] Prevents #getRandomPlayer from throwing an Exception on 0 online players --- .../src/main/java/com/songoda/core/utils/PlayerUtils.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Core/src/main/java/com/songoda/core/utils/PlayerUtils.java b/Core/src/main/java/com/songoda/core/utils/PlayerUtils.java index 17c9b397..83d50118 100644 --- a/Core/src/main/java/com/songoda/core/utils/PlayerUtils.java +++ b/Core/src/main/java/com/songoda/core/utils/PlayerUtils.java @@ -162,12 +162,18 @@ public class PlayerUtils { public static Player getRandomPlayer() { final Collection all = Bukkit.getOnlinePlayers(); + if (all.isEmpty()) { + return null; + } + final Iterator alli = all.iterator(); + int pick = random.nextInt(all.size()); for (; pick > 0; --pick) { alli.next(); } - return alli.hasNext() ? alli.next() : null; + + return alli.next(); } public static void giveItem(Player player, ItemStack item) {