@@ -21,47 +21,27 @@ public DataManager(FlyPlugin plugin) {
2121 }
2222 }
2323
24- public void loadAllPlayerData () {
25- // Загружаем данные только для онлайн игроков
26- for (Player player : Bukkit .getOnlinePlayers ()) {
27- loadPlayerData (player .getUniqueId ());
28- }
29- }
30-
31- public void loadPlayerData (UUID playerId ) {
24+ public FlightData loadPlayerData (UUID playerId ) {
3225 File playerFile = getPlayerFile (playerId );
26+ FlightData data = new FlightData ();
27+
3328 if (!playerFile .exists ()) {
34- return ;
29+ return data ; // Возвращаем пустые данные
3530 }
3631
3732 FileConfiguration config = YamlConfiguration .loadConfiguration (playerFile );
38- FlightData data = new FlightData ();
3933
4034 data .setBalance (config .getDouble ("balance" , 0 ));
4135 data .setMaxUnlockedLevel (config .getInt ("maxUnlockedLevel" , 0 ));
4236 data .setCooldownEnd (config .getLong ("cooldownEnd" , 0 ));
4337 data .setFlightActive (config .getBoolean ("flightActive" , false ));
4438 data .setFlightEndTime (config .getLong ("flightEndTime" , 0 ));
45- data .setPausedTime (config .getLong ("pausedTime" , 0 )); // ДОБАВЬТЕ
46-
47- plugin .setPlayerFlightData (playerId , data );
39+ data .setPausedTime (config .getLong ("pausedTime" , 0 ));
4840
49- // НЕ восстанавливаем активный полёт при входе - только сохранённое время
50- // Активный полёт должен быть активирован через /mfly continue
41+ return data ;
5142 }
5243
53- public void saveAllPlayerData () {
54- for (UUID playerId : plugin .getAllPlayerFlightData ().keySet ()) {
55- savePlayerData (playerId );
56- }
57- }
58-
59- public void savePlayerData (UUID playerId ) {
60- FlightData data = plugin .getPlayerFlightData (playerId );
61- if (data == null ) {
62- return ;
63- }
64-
44+ public void savePlayerData (UUID playerId , FlightData data ) {
6545 File playerFile = getPlayerFile (playerId );
6646 FileConfiguration config = new YamlConfiguration ();
6747
@@ -70,7 +50,7 @@ public void savePlayerData(UUID playerId) {
7050 config .set ("cooldownEnd" , data .getCooldownEnd ());
7151 config .set ("flightActive" , data .isFlightActive ());
7252 config .set ("flightEndTime" , data .getFlightEndTime ());
73- config .set ("pausedTime" , data .getPausedTime ()); // ДОБАВЬТЕ
53+ config .set ("pausedTime" , data .getPausedTime ());
7454
7555 try {
7656 config .save (playerFile );
@@ -80,10 +60,6 @@ public void savePlayerData(UUID playerId) {
8060 }
8161 }
8262
83- public void savePlayerData (Player player ) {
84- savePlayerData (player .getUniqueId ());
85- }
86-
8763 private File getPlayerFile (UUID playerId ) {
8864 return new File (dataFolder , playerId .toString () + ".yml" );
8965 }
0 commit comments