Rewrote player persistence system; close #117

DRE2N · Jul 26, 2016 · 3366f6b · 3366f6b
1 parent b175b2b
commit 3366f6b
Show file tree

Hide file tree

Showing 19 changed files with 370 additions and 507 deletions.
diff --git a/abstract/pom.xml b/abstract/pom.xml
@@ -8,6 +8,6 @@
     <parent>
         <groupId>io.github.dre2n</groupId>
         <artifactId>dungeonsxl</artifactId>
-        <version>0.14.4</version>
+        <version>0.15-SNAPSHOT</version>
     </parent>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.github.dre2n</groupId>
         <artifactId>dungeonsxl</artifactId>
-        <version>0.14.4</version>
+        <version>0.15-SNAPSHOT</version>
     </parent>
     <build>
         <resources>

diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java b/core/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java
@@ -39,7 +39,6 @@
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
 import io.github.dre2n.dungeonsxl.player.DPlayers;
-import io.github.dre2n.dungeonsxl.player.DSavePlayer;
 import io.github.dre2n.dungeonsxl.requirement.RequirementTypes;
 import io.github.dre2n.dungeonsxl.reward.DLootInventory;
 import io.github.dre2n.dungeonsxl.reward.RewardTypes;
@@ -280,14 +279,12 @@ public void loadCore() {
     // Save and load
     public void saveData() {
         protections.saveAll();
-        DSavePlayer.save();
         dWorlds.saveAll();
     }
 
     public void loadData() {
         protections.loadAll();
         dPlayers.loadAll();
-        DSavePlayer.load();
         dWorlds.check();
     }
 

diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java
@@ -23,7 +23,6 @@
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import java.io.File;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.PluginManager;

diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java
@@ -140,6 +140,7 @@ public enum DMessages implements Messages {
     LOG_ERROR_SIGN_SETUP("Log_Error_SignSetup", "&4A sign at &6&v1&4 is erroneous!"),
     LOG_GENERATE_NEW_WORLD("Log_GenerateNewWorld", "&6Generating new world..."),
     LOG_IMPORT_WORLD("Log_ImportWorld", "&6Importing world..."),
+    LOG_KILLED_CORRUPTED_PLAYER("Log_KilledCorruptedPlayer", "&4Killed player &6&v1 &4because the data to restore his main inventory is corrupted :("),
     LOG_NEW_MAP("Log_NewDungeon", "&6Creating new map."),
     LOG_NEW_PLAYER_DATA("Log_NewPlayerData", "&6A new player data file has been created and saved as &v1."),
     LOG_WORLD_GENERATION_FINISHED("Log_WorldGenerationFinished", "&6World generation finished!"),