kaboomserver/extras
1
0
Fork 1
mirror of https://github.com/kaboomserver/extras.git synced 2024-11-27 01:45:44 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add more detailed error messages to /skin and a timeout of 15 seconds (#357)

Browse source
This commit is contained in:
OptimisticDev 2024-08-01 08:37:13 +00:00 committed by GitHub
parent 6fc8d1117c
commit e20467b7af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/pw/kaboom/extras/modules/player/skin/SkinManager.java
View file

@ -1,6 +1,7 @@
package pw.kaboom.extras.modules.player.skin; package pw.kaboom.extras.modules.player.skin;
import com.google.gson.Gson; import com.google.gson.Gson;
import java.lang.InterruptedException;
import java.net.URI; import java.net.URI;
import java.net.http.HttpClient; import java.net.http.HttpClient;
import java.net.http.HttpRequest; import java.net.http.HttpRequest;
@ -10,8 +11,12 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.TimeUnit;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -58,8 +63,22 @@ public final class SkinManager {
final SkinData skinData; final SkinData skinData;
try { try {
skinData = getSkinData(name).get(); skinData = getSkinData(name).get(15, TimeUnit.SECONDS);
} catch (Exception e) { } catch (InterruptedException e) {
if (!shouldSendMessage) {
return;
}
player.sendMessage(Component.text("Skin fetching was interrupted"));
return;
} catch (TimeoutException e) {
if (!shouldSendMessage) {
return;
}
player.sendMessage(Component.text("Took too long to fetch skin"));
return;
} catch (ExecutionException | CompletionException e) {
if(!shouldSendMessage) { if(!shouldSendMessage) {
return; return;
} }