TotalFreedomMC/TF-Marriage
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-Marriage.git synced 2024-05-30 00:21:24 +00:00
Code Issues Projects Releases Wiki Activity

Optimize converter

Browse source
This commit is contained in:
Lennart ten Wolde 2016-02-23 14:18:19 +01:00
parent 50f859e3be
commit 477c6108c9
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java
View file

@ -94,6 +94,10 @@ public class MarriageCore extends MarriageBase {
return dataManager.listMarriages(scale, page);
}
public DataManager getDataManager() {
return dataManager;
}
public void removeMarriage(final MData mdata) {
new Thread() {
@Override

15
src/main/java/com/lenis0012/bukkit/marriage2/internal/data/DataConverter.java
View file

@ -52,7 +52,7 @@ public class DataConverter {
}
}
double progress = (completed + 1.0) / totalFiles;
double progress = (completed + 1.0) / (double) totalFiles;
if(System.currentTimeMillis() >= lastMessage) {
lastMessage = System.currentTimeMillis() + 2500; // Update every 2.5 seconds
reportStatus(progress);
@ -64,16 +64,16 @@ public class DataConverter {
int completed = 0;
for(Map.Entry<String, UUID> entry : uuidMap.entrySet()) {
try {
MarriagePlayer mp = core.getDataManager().loadPlayer(entry.getValue());
String name = entry.getKey();
File file = new File(dir, name + ".yml");
FileConfiguration cnf = YamlConfiguration.loadConfiguration(file);
cnf.load(file);
MPlayer mp = core.getMPlayer(entry.getValue());
if(cnf.contains("partner")) {
if(cnf.contains("partner") && !mp.isMarried()) {
UUID uuid = uuidMap.get(cnf.getString("partner"));
if(uuid != null) {
MPlayer mp2 = core.getMPlayer(uuid);
MarriagePlayer mp2 = core.getDataManager().loadPlayer(uuid);
MData mdata = core.marry(mp, mp2);
if(cnf.contains("home")) {
@ -88,6 +88,9 @@ public class DataConverter {
mdata.setHome(location);
}
}
// Only save if players are married, otherwise we really don't care.
core.getDataManager().savePlayer(mp);
core.getDataManager().savePlayer(mp2);
}
}
} catch(Exception e) {
@ -101,10 +104,6 @@ public class DataConverter {
}
}
// Save changes
core.getLogger().log(Level.INFO, "Saving changes in database...");
core.unloadAll();
// Reset old data
core.getLogger().log(Level.INFO, "Renaming playerdata file...");
int remainingTries = 60; // Try 60 times