6.0.12 Update onlinePlayers()

Bkm016 · Bkm016 · commit 4e6c711c07cd · 2023-10-12T02:51:58.000+08:00
diff --git a/platform/platform-bukkit/src/main/kotlin/taboolib/platform/BukkitAdapter.kt b/platform/platform-bukkit/src/main/kotlin/taboolib/platform/BukkitAdapter.kt
@@ -30,7 +30,11 @@ class BukkitAdapter : PlatformAdapter {
     }
 
     override fun onlinePlayers(): List<ProxyPlayer> {
-        return Bukkit.getWorlds().flatMap { it.players }.filter { Bukkit.getPlayer(it.uniqueId) != null }.map { adaptPlayer(it) }
+        return try {
+            Bukkit.getOnlinePlayers().map { adaptPlayer(it) }
+        } catch (_: NoSuchMethodError) {
+            Bukkit.getWorlds().flatMap { it.players }.filter { Bukkit.getPlayer(it.uniqueId) != null }.map { adaptPlayer(it) }
+        }
     }
 
     override fun adaptPlayer(any: Any): ProxyPlayer {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,11 @@ class BukkitAdapter : PlatformAdapter {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`override fun onlinePlayers(): List<ProxyPlayer> {`
`33`		`- return Bukkit.getWorlds().flatMap { it.players }.filter { Bukkit.getPlayer(it.uniqueId) != null }.map { adaptPlayer(it) }`
	`33`	`+ return try {`
	`34`	`+ Bukkit.getOnlinePlayers().map { adaptPlayer(it) }`
	`35`	`+ } catch (_: NoSuchMethodError) {`
	`36`	`+ Bukkit.getWorlds().flatMap { it.players }.filter { Bukkit.getPlayer(it.uniqueId) != null }.map { adaptPlayer(it) }`
	`37`	`+ }`
`34`	`38`	`}`
`35`	`39`
`36`	`40`	`override fun adaptPlayer(any: Any): ProxyPlayer {`