feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Fix loading of settings

Browse Source
This commit is contained in:
games647
2016-09-19 17:59:45 +02:00
parent acab4766b1
commit da266c7e91
15 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java
+4 -3
View File
@@ -66,8 +66,7 @@ public abstract class FastLoginCore<P> {
private final Set<UUID> pendingConfirms = Sets.newHashSet();
private final SharedConfig sharedConfig;
private final MojangApiConnector apiConnector;
private MojangApiConnector apiConnector;
private AuthStorage storage;
private PasswordGenerator<P> passwordGenerator = new DefaultPasswordGenerator<>();
private AuthPlugin<P> authPlugin;
@@ -75,7 +74,9 @@ public abstract class FastLoginCore<P> {
public FastLoginCore(Map<String, Object> config) {
this.pendingLogins = FastLoginCore.buildCache(5, 0);
this.sharedConfig = new SharedConfig(config);
}
public void setApiConnector() {
List<String> ipAddresses = sharedConfig.get("ip-addresses");
int requestLimit = sharedConfig.get("mojang-request-limit");
this.apiConnector = makeApiConnector(getLogger(), ipAddresses, requestLimit);
core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java
+2 -1
View File
@@ -1,8 +1,9 @@
package com.github.games647.fastlogin.core.shared;
import com.github.games647.fastlogin.core.hooks.AuthPlugin;
import com.github.games647.fastlogin.core.PlayerProfile;
import com.github.games647.fastlogin.core.SharedConfig;
import com.github.games647.fastlogin.core.hooks.AuthPlugin;
import java.util.UUID;
import java.util.logging.Level;
core/src/main/java/com/github/games647/fastlogin/core/shared/MojangApiConnector.java
+4 -3
View File
@@ -7,6 +7,7 @@ import com.google.common.io.CharStreams;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.URL;
@@ -126,9 +127,9 @@ public abstract class MojangApiConnector {
return null;
}
BufferedReader reader = new BufferedReader(new InputStreamReader(httpConnection.getInputStream()));
String input = CharStreams.toString(reader);
return FastLoginCore.parseId(getUUIDFromJson(input));
Reader reader = new InputStreamReader(httpConnection.getInputStream());
String json = CharStreams.toString(reader);
return FastLoginCore.parseId(getUUIDFromJson(json));
} catch (IOException iOException) {
logger.log(Level.SEVERE, "Tried converting name->uuid from third-party api", iOException);
}