diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java
index f1df000c9..cf0643c95 100644
--- a/src/main/java/noppes/npcs/NoppesUtilServer.java
+++ b/src/main/java/noppes/npcs/NoppesUtilServer.java
@@ -25,6 +25,7 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.config.ConfigMain;
 import noppes.npcs.constants.EnumGuiType;
 import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.constants.EnumPlayerData;
@@ -493,7 +494,11 @@ public class NoppesUtilServer {
 			playerdata = PlayerDataController.instance.getPlayerData(pl);
 
         if(type == EnumPlayerData.Players){
-            File file = new File(PlayerDataController.instance.getSaveDir(), playerdata.uuid + ".json");
+			String fileType = ".json";
+			if(ConfigMain.DatFormat){
+				fileType = ".dat";
+			}
+            File file = new File(PlayerDataController.instance.getSaveDir(), playerdata.uuid + fileType);
             if(file.exists())
             	file.delete();
             if(pl != null){
diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java
index 3904616e3..28204067c 100644
--- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java
+++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java
@@ -279,7 +279,7 @@ public class PlayerDataController {
 			for(String name : nameUUIDs.keySet()){
 				if(name.equalsIgnoreCase(username)){
 					data = new PlayerData();
-					data.setNBT(PlayerData.loadPlayerData(nameUUIDs.get(name)));
+					data.setNBT(PlayerDataController.instance.loadPlayerData(nameUUIDs.get(name)));
 					break;
 				}
 			}
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
index 5f6437691..8689c90c9 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
@@ -169,28 +169,6 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
 		world.spawnEntityInWorld(npc);
 	}
 
-	public static NBTTagCompound loadPlayerData(String player) {
-		File saveDir = CustomNpcs.getWorldSaveDirectory("playerdata");
-		String filename = player;
-		if (player.isEmpty()) {
-			filename = "noplayername";
-		}
-
-		filename = filename + ".json";
-		File file = null;
-
-		try {
-			file = new File(saveDir, filename);
-			if (file.exists()) {
-				return NBTJsonUtil.LoadFile(file);
-			}
-		} catch (Exception var5) {
-			LogWriter.error("Error loading: " + file.getAbsolutePath(), var5);
-		}
-
-		return new NBTTagCompound();
-	}
-
 	public void setCompanion(ICustomNpc npc) {
 		this.setCompanion((EntityNPCInterface) npc.getMCEntity());
 	}