diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java index 53586d2..576f331 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java @@ -146,17 +146,14 @@ public void backup(@NotNull Backpack backpack) private void loadPlayer(final @NotNull MinepacksPlayerData player) { - if(syncCooldown) - player.setCooldownData(System.currentTimeMillis()); - backend.loadPlayer(player); - player.notifyOnLoad(p -> { - if(!bungeeCordMode) - { + if(!bungeeCordMode) + { + player.notifyOnLoad(p -> { loadBackpack(player); - } - }); + }); + } } public void loadBackpack(final @NotNull MinepacksPlayerData player) @@ -175,7 +172,7 @@ public void onPlayerLoginEvent(final @NotNull PlayerJoinEvent event) }); } - public @NotNull MinepacksPlayerExtended getPlayer(final @NotNull OfflinePlayer offlinePlayer) + public @NotNull MinepacksPlayerData getPlayer(final @NotNull OfflinePlayer offlinePlayer) { MinepacksPlayerData player = cache.getCachedPlayer(offlinePlayer.getUniqueId()); if(player != null) return player; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java index 1940969..c048022 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java @@ -29,10 +29,7 @@ import at.pcgamingfreaks.Minepacks.Bukkit.Command.CommandManager; import at.pcgamingfreaks.Minepacks.Bukkit.Command.InventoryClearCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Command.ShortcutCommand; -import at.pcgamingfreaks.Minepacks.Bukkit.Database.BackpacksConfig; -import at.pcgamingfreaks.Minepacks.Bukkit.Database.Config; -import at.pcgamingfreaks.Minepacks.Bukkit.Database.Database; -import at.pcgamingfreaks.Minepacks.Bukkit.Database.Language; +import at.pcgamingfreaks.Minepacks.Bukkit.Database.*; import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.BackpackExtended; import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommandManager; import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksPlayerExtended; @@ -310,7 +307,7 @@ public void getBackpack(final @NotNull OfflinePlayer owner, final @NotNull Callb } @Override - public @NotNull MinepacksPlayerExtended getMinepacksPlayer(final @NotNull OfflinePlayer player) + public @NotNull MinepacksPlayerData getMinepacksPlayer(final @NotNull OfflinePlayer player) { return database.getPlayer(player); }