From e0191ccf891df94428e61089cff36c722355c4a5 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Fri, 2 Jun 2023 03:24:44 -0400
Subject: [PATCH] Prevent Mass conversions

---
 .../controllers/PlayerDataController.java     | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java
index fe0c45e36..3904616e3 100644
--- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java
+++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java
@@ -164,8 +164,10 @@ public class PlayerDataController {
 	public File getNewSaveDir(){
 		try{
 			File file = new File(CustomNpcs.getWorldSaveDirectory(),"playerdata_new");
-			if(!file.exists())
-				file.mkdir();
+			if(file.exists()){
+				return null;
+			}
+			file.mkdir();
 			return file;
 		}
 		catch (Exception e) {
@@ -440,6 +442,14 @@ public class PlayerDataController {
 					}
 					int tenPercent = (int) ((double) length * 0.1);
 					int progress = 0;
+					File saveDir = PlayerDataController.instance.getNewSaveDir();
+					if(saveDir == null){
+						if(sender != null){
+							sender.addChatMessage(new ChatComponentText("playerdata_new folder already exists please delete it or rename it"));
+						}
+						LogWriter.error("playerdata_new folder already exists please delete it or rename it");
+						return;
+					}
 					// Load the files in parallel using a stream
 					for(int i = 0; i < length; i++){
 						File file = files[i];
@@ -468,9 +478,8 @@ public class PlayerDataController {
 							}
 							if(valid){
 								try {
-									File saveDir = PlayerDataController.instance.getNewSaveDir();
-									File newFile = new File(saveDir, filename + "_new");
-									File oldFile = new File(saveDir, filename);
+									File newFile = new File(saveDir, filename + "_new" + fileType);
+									File oldFile = new File(saveDir, filename + fileType);
 									if(type){
 										CompressedStreamTools.writeCompressed(compound, new FileOutputStream(newFile));
 									} else {