From 3cc26b7cd1af28e720101236125d023d1682edb2 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 22 Aug 2018 15:45:18 +0200
Subject: [PATCH] Fixed fetching skin message never being cleared

---
 .../voxelmodpack/hdskins/SkinUploader.java    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java b/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
index e66ba9fa..a30e8ba7 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
@@ -206,20 +206,21 @@ public class SkinUploader implements Closeable {
         throttlingNeck = false;
         offline = false;
 
-        remotePlayer.reloadRemoteSkin(this, this::onSetRemoteSkin).exceptionally(throwable -> {
-            throwable = throwable.getCause();
-
-            throwable.printStackTrace();
-
+        remotePlayer.reloadRemoteSkin(this, this::onSetRemoteSkin).handle((a, throwable) -> {
             fetchingSkin = false;
 
+            if (throwable != null) {
+                throwable = throwable.getCause();
 
-            if (throwable instanceof AuthenticationUnavailableException) {
-                offline = true;
-            } else {
-                throttlingNeck = true;
+                throwable.printStackTrace();
+
+                if (throwable instanceof AuthenticationUnavailableException) {
+                    offline = true;
+                } else {
+                    throttlingNeck = true;
+                }
             }
-            return null;
+            return a;
         });
     }