From 52944aa7e9401a01958f5cc630b77e449c2efdd0 Mon Sep 17 00:00:00 2001 From: bluefireoly Date: Fri, 18 Sep 2020 22:26:42 +0200 Subject: [PATCH] Update IPAddressData.kt --- .../axay/kspigot/ipaddress/IPAddressData.kt | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/net/axay/kspigot/ipaddress/IPAddressData.kt b/src/main/kotlin/net/axay/kspigot/ipaddress/IPAddressData.kt index 9ad39a60..e834c280 100644 --- a/src/main/kotlin/net/axay/kspigot/ipaddress/IPAddressData.kt +++ b/src/main/kotlin/net/axay/kspigot/ipaddress/IPAddressData.kt @@ -14,15 +14,22 @@ val Player.ipAddressData get() = ipAddressData() fun Player.ipAddressData(language: IPAddressDataLanguage = IPAddressDataLanguage.ENGLISH): IPAddressData? { - val hostString = address?.hostString ?: return null - val jsonObject = ValueHolder.gson.fromJson( - URL("$IP_API${hostString}?fields=${IP_API_FIELDS}?lang=${language.code}").readText(), - JsonObject::class.java - ) ?: return null + return try { - if (jsonObject["status"].toString() == "fail") return null + val hostString = address?.hostString ?: return null - return IPAddressData(jsonObject) + val jsonObject = ValueHolder.gson.fromJson( + URL("$IP_API${hostString}?fields=${IP_API_FIELDS}?lang=${language.code}").readText(), + JsonObject::class.java + ) ?: return null + + if (jsonObject["status"].toString() == "fail") return null + + IPAddressData(jsonObject) + + } catch (exc: Exception) { + null + } }