EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 10:14:43 +02:00
Code Issues Projects Releases Wiki Activity

Fixed bugs that could occur while updating old DBs to have UUIDs

Browse Source
This commit is contained in:
nossr50
2019-05-05 16:41:42 -07:00
parent 588b6f3692
commit 23b7e11dd1
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java
View File

@ -68,15 +68,18 @@ public class UUIDUpdateAsyncTask extends BukkitRunnable {
}
catch (Exception e) {
// Handle 429
if (e.getMessage().contains("429")) {
size += userNamesSection.size();
try {
Thread.sleep(LIMIT_PERIOD);
} catch (InterruptedException ex) {
e.printStackTrace();
return;
if(e.getMessage() != null)
{
if (e.getMessage().contains("429")) {
size += userNamesSection.size();
try {
Thread.sleep(LIMIT_PERIOD);
} catch (InterruptedException ex) {
e.printStackTrace();
return;
}
continue;
}
continue;
}
plugin.getLogger().log(Level.SEVERE, "Unable to fetch UUIDs!", e);

11
src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java
View File

@ -1,10 +1,12 @@
package com.gmail.nossr50.util.uuid;
import com.google.common.collect.ImmutableList;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
@ -43,10 +45,13 @@ public class UUIDFetcher implements Callable<Map<String, UUID>> {
array.add(element);
}
String body = array.getAsString();
Gson gson = new Gson();
String body = array.toString();
writeBody(connection, body);
for (Object profile : array) {
JsonObject jsonProfile = (JsonObject) profile;
JsonObject[] jsonStreamArray = gson.fromJson(new InputStreamReader(connection.getInputStream()), JsonObject[].class);
for (JsonObject jsonProfile : jsonStreamArray) {
String id = jsonProfile.get("id").getAsString();
String name = jsonProfile.get("name").getAsString();
UUID uuid = UUIDFetcher.getUUID(id);