Merge pull request #108 from caucow/master

Fix NMS skin lookup lag (by ripkilling the Future so they don't happen)

Author: wingzero54

src/main/java/vg/civcraft/mc/civmodcore/util/SkinCache.java

@@ -67,7 +67,7 @@ public SkinData load(UUID uuid) throws Exception {
 						if (profile.hasTextures()) {
 							return new SkinData(profile);
 						}
-						throw new Exception("Could not complete() PlayerProfile for " + uuid + " (rate limited or profile doesn't exist)");
+						throw new SkinLoadException("Could not complete() PlayerProfile for " + uuid + " (rate limited or profile doesn't exist)");
 					}
 				});
 		this.futureCache = CacheBuilder.newBuilder()
@@ -78,8 +78,23 @@ public CompletableFuture<SkinData> load(UUID uuid) throws Exception {
 						return CompletableFuture.supplyAsync(() -> {
 							try {
 								return skinCache.get(uuid);
-							} catch (Exception e) {
-								return new SkinData(Bukkit.createProfile(uuid));
+							} catch (Exception ex) {
+								// This was causing "issues" with nms querying
+								// the skin server. Just going to log the
+								// exception now I guess
+								// return new SkinData(Bukkit.createProfile(uuid));
+								if (ex instanceof SkinLoadException) {
+									plugin.getLogger().log(Level.WARNING, "Exception loading skin: " + ex.getMessage());
+								} else {
+									plugin.getLogger().log(Level.WARNING, "Exception loading skin", ex);
+								}
+								// also complete exceptionally to cancel later
+								// CompletionStages
+								if (ex instanceof RuntimeException) {
+									throw (RuntimeException) ex;
+								} else {
+									throw new RuntimeException("Skin could not be loaded", ex);
+								}
 							}
 						}, executor);
 					}
@@ -170,4 +185,10 @@ public SkinData(PlayerProfile profile) {
 		}
 
 	}
+
+	public static class SkinLoadException extends RuntimeException {
+		public SkinLoadException(String message) {
+			super(message);
+		}
+	}
 }