Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-19 14:59:21 +00:00
Code Issues Releases Activity

Fix for a ConcurrentModificationException that can occur during the data save process

Browse Source
This commit is contained in:
William
2021-10-26 13:32:49 +01:00
parent deb92a767a
commit af95e80765
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeRedisListener.java
View File

@@ -172,7 +172,7 @@ public class BungeeRedisListener extends RedisListener {
// When all the data has been received, save it // When all the data has been received, save it
if (MPDBMigrator.migratedDataSent == MPDBMigrator.playersMigrated) { if (MPDBMigrator.migratedDataSent == MPDBMigrator.playersMigrated) {
MPDBMigrator.loadIncomingData(); MPDBMigrator.loadIncomingData(MPDBMigrator.incomingPlayerData);
} }
} }
} }

24
bungeecord/src/main/java/me/william278/husksync/bungeecord/migrator/MPDBMigrator.java
View File

@@ -33,7 +33,7 @@ public class MPDBMigrator {
private static final HuskSyncBungeeCord plugin = HuskSyncBungeeCord.getInstance(); private static final HuskSyncBungeeCord plugin = HuskSyncBungeeCord.getInstance();
public static HashMap<PlayerData,String> incomingPlayerData; public static HashMap<PlayerData, String> incomingPlayerData;
public static MigrationSettings migrationSettings = new MigrationSettings(); public static MigrationSettings migrationSettings = new MigrationSettings();
private static Database sourceDatabase; private static Database sourceDatabase;
@@ -198,15 +198,17 @@ public class MPDBMigrator {
} }
/** /**
* Load all incoming decoded MPDB data to cache / SQL * Loads all incoming decoded MPDB data to the cache and database
*
* @param dataToLoad HashMap of the {@link PlayerData} to player Usernames that will be loaded
*/ */
public static void loadIncomingData() { public static void loadIncomingData(HashMap<PlayerData, String> dataToLoad) {
ProxyServer.getInstance().getScheduler().runAsync(plugin, () -> { ProxyServer.getInstance().getScheduler().runAsync(plugin, () -> {
int playersSaved = 0; int playersSaved = 0;
plugin.getLogger().log(Level.INFO, "Saving data for " + playersMigrated + " players..."); plugin.getLogger().log(Level.INFO, "Saving data for " + playersMigrated + " players...");
for (PlayerData playerData : incomingPlayerData.keySet()) { for (PlayerData playerData : dataToLoad.keySet()) {
String playerName = incomingPlayerData.get(playerData); String playerName = dataToLoad.get(playerData);
// Add the player to the MySQL table // Add the player to the MySQL table
DataManager.ensurePlayerExists(playerData.getPlayerUUID(), playerName); DataManager.ensurePlayerExists(playerData.getPlayerUUID(), playerName);
@@ -220,15 +222,15 @@ public class MPDBMigrator {
// Mark as done when done // Mark as done when done
plugin.getLogger().log(Level.INFO, """ plugin.getLogger().log(Level.INFO, """
=== MySQLPlayerDataBridge Migration Wizard ========== === MySQLPlayerDataBridge Migration Wizard ==========
Migration complete! Migration complete!
Successfully migrated data for %1%/%2% players. Successfully migrated data for %1%/%2% players.
You should now uninstall MySQLPlayerDataBridge from You should now uninstall MySQLPlayerDataBridge from
the rest of the Spigot servers, then restart them. the rest of the Spigot servers, then restart them.
""".replaceAll("%1%", Integer.toString(MPDBMigrator.playersMigrated)) """.replaceAll("%1%", Integer.toString(MPDBMigrator.playersMigrated))
.replaceAll("%2%", Integer.toString(MPDBMigrator.migratedDataSent))); .replaceAll("%2%", Integer.toString(MPDBMigrator.migratedDataSent)));
sourceDatabase.close(); // Close source database sourceDatabase.close(); // Close source database
}); });