From a18b55b5f71e54c67bac7115fa81070d68da8d31 Mon Sep 17 00:00:00 2001 From: fullwall Date: Tue, 2 Aug 2016 00:47:52 +0800 Subject: [PATCH] Split auth server into separate method --- .../java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java | 6 +++++- .../java/net/citizensnpcs/npc/profile/ProfileFetcher.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java index 779435918..0cf81e888 100644 --- a/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java +++ b/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java @@ -258,7 +258,7 @@ public class NMSImpl implements NMSBridge { .getAuthenticationService(); URL url = HttpAuthenticationService - .constantURL(Setting.AUTH_SERVER_URL.asString() + UUIDTypeAdapter.fromUUID(profile.getId())); + .constantURL(getAuthServerBaseUrl() + UUIDTypeAdapter.fromUUID(profile.getId())); url = HttpAuthenticationService.concatenateURL(url, "unsigned=" + !requireSecure); @@ -274,6 +274,10 @@ public class NMSImpl implements NMSBridge { return result; } + public String getAuthServerBaseUrl() { + return Setting.AUTH_SERVER_URL.asString(); + } + @Override public BossBar getBossBar(org.bukkit.entity.Entity entity) { BossBattleServer bserver = null; diff --git a/src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java b/src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java index 7e4be9528..68983f860 100644 --- a/src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java +++ b/src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java @@ -76,7 +76,7 @@ public class ProfileFetcher { if (request == null) return; - try { + try { request.setResult(NMS.fillProfileProperties(profile, true), ProfileFetchResult.SUCCESS); } catch (Exception e) { if (Messaging.isDebugging()) {