|
20 | 20 | import java.io.File;
|
21 | 21 | import java.sql.SQLException;
|
22 | 22 | import java.util.Comparator;
|
| 23 | +import java.util.List; |
23 | 24 | import java.util.concurrent.CompletableFuture;
|
24 | 25 |
|
25 | 26 | @Getter
|
@@ -51,6 +52,11 @@ public void init() throws SQLException {
|
51 | 52 | String databaseURL = getDatabaseURL(sqlConfig);
|
52 | 53 |
|
53 | 54 | DataPersisterManager.registerDataPersisters(XMaterialType.getSingleton());
|
| 55 | + DataPersisterManager.registerDataPersisters(XEntityTypeType.getSingleton()); |
| 56 | + DataPersisterManager.registerDataPersisters(XPotionType.getSingleton()); |
| 57 | + DataPersisterManager.registerDataPersisters(XEnchantType.getSingleton()); |
| 58 | + DataPersisterManager.registerDataPersisters(XBiomeType.getSingleton()); |
| 59 | + |
54 | 60 | DataPersisterManager.registerDataPersisters(LocationType.getSingleton());
|
55 | 61 | DataPersisterManager.registerDataPersisters(InventoryType.getSingleton());
|
56 | 62 | DataPersisterManager.registerDataPersisters(LocalDateTimeType.getSingleton());
|
@@ -78,6 +84,14 @@ public void init() throws SQLException {
|
78 | 84 | this.teamMissionTableManager = new ForeignIslandTableManager<>(teamMission -> getDatabaseKey(teamMission.getTeamID(), teamMission.getMissionName()), connectionSource, TeamMission.class);
|
79 | 85 | this.teamRewardsTableManager = new ForeignIslandTableManager<>(teamRewards -> getDatabaseKey(teamRewards.getId()), connectionSource, TeamReward.class);
|
80 | 86 | this.teamSettingsTableManager = new ForeignIslandTableManager<>(teamSetting -> getDatabaseKey(teamSetting.getTeamID(), teamSetting.getSetting()), connectionSource, TeamSetting.class);
|
| 87 | + |
| 88 | + // We need to clear out null values |
| 89 | + for(TeamBlock teamBlock : teamBlockTableManager.getEntries()) { |
| 90 | + if(teamBlock.getXMaterial() == null) teamBlockTableManager.delete(teamBlock); |
| 91 | + } |
| 92 | + for(TeamSpawners teamSpawners : teamSpawnerTableManager.getEntries()) { |
| 93 | + if(teamSpawners.getEntityType() == null) teamSpawnerTableManager.delete(teamSpawners); |
| 94 | + } |
81 | 95 | }
|
82 | 96 |
|
83 | 97 | private String getDatabaseKey(Object... params) {
|
|
0 commit comments