Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-23 02:55:45 +01:00
Code Issues Projects Releases Wiki Activity

Split auth server into separate method

Browse Source
This commit is contained in:
fullwall 2016-08-02 00:47:52 +08:00
parent 28b0c4fdc3
commit a18b55b5f7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
View File

@ -258,7 +258,7 @@ public class NMSImpl implements NMSBridge {
.getAuthenticationService(); .getAuthenticationService();
URL url = HttpAuthenticationService 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); url = HttpAuthenticationService.concatenateURL(url, "unsigned=" + !requireSecure);
@ -274,6 +274,10 @@ public class NMSImpl implements NMSBridge {
return result; return result;
} }
public String getAuthServerBaseUrl() {
return Setting.AUTH_SERVER_URL.asString();
}
@Override @Override
public BossBar getBossBar(org.bukkit.entity.Entity entity) { public BossBar getBossBar(org.bukkit.entity.Entity entity) {
BossBattleServer bserver = null; BossBattleServer bserver = null;

2
src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java
View File

@ -76,7 +76,7 @@ public class ProfileFetcher {
if (request == null) if (request == null)
return; return;
try { try {
request.setResult(NMS.fillProfileProperties(profile, true), ProfileFetchResult.SUCCESS); request.setResult(NMS.fillProfileProperties(profile, true), ProfileFetchResult.SUCCESS);
} catch (Exception e) { } catch (Exception e) {
if (Messaging.isDebugging()) { if (Messaging.isDebugging()) {