@@ -47,15 +47,20 @@ public void checkFiles() {
4747 new BukkitRunnable () {
4848 @ Override
4949 public void run () {
50- File folder = new File ("plugins\\ Essentials\\ userdata" );
51- File [] listOfFiles = folder .listFiles ();
52- usermap = new File ("plugins\\ Essentials\\ usermap.csv" );
53- makeFolder ();
50+ debug ("Starting a purge" );
51+ File folder = new File (main .getDataFolder () + File .separator + ".." + File .separator + "Essentials" + File .separator + "userdata" );
52+ debug ("Userdata folder path = " + main .getDataFolder () + File .separator + ".." + File .separator + "Essentials" + File .separator + "userdata" );
53+ File [] listOfFiles = folder .listFiles ();
54+ usermap = new File (main .getDataFolder () + File .separator + ".." + File .separator + "Essentials" + File .separator + "usermap.csv" );
55+ debug ("Defined files" );
56+ makeFolder ();
5457 int checkedFiles = 0 ;
5558 int shouldDelete = 0 ;
5659 int deletedFiles = 0 ;
5760 if (listOfFiles != null ) {
5861 if (listOfFiles .length >= 1 ) {
62+ debug ("Found " + listOfFiles .length + " files to handle" );
63+ debug ("Starting to run files" );
5964 for (File file : listOfFiles ) {
6065 checkedFiles ++;
6166 if (checkFile (file )) {
@@ -67,14 +72,20 @@ public void run() {
6772
6873 }
6974 }
70- }
75+ } else { debug ( "List of files == null" ); }
7176 Bukkit .getServer ().getConsoleSender ().sendMessage ("Checked files: " + checkedFiles );
7277 Bukkit .getServer ().getConsoleSender ().sendMessage ("Files sent to deletion: " + shouldDelete );
7378 Bukkit .getServer ().getConsoleSender ().sendMessage ("Files successfully deleted: " + deletedFiles );
7479 }
7580 }.runTaskAsynchronously (this .main );
7681 }
7782
83+ private void debug (String message ) {
84+ if (main .debug ) {
85+ Bukkit .getServer ().getConsoleSender ().sendMessage ("§aEssClean DEBUG: §r" + message );
86+ }
87+ }
88+
7889 private boolean checkFile (File file ) {
7990 if (compareSize (file )) {
8091 if (lastModified (file )) {
@@ -105,6 +116,7 @@ private boolean cantContain(File file) {
105116 lineChecked = true ;
106117 String line = scanner .nextLine ();
107118 if (cantContain .contains (line )) {
119+ debug ("Files contains illegal lines" );
108120 return false ;
109121 }
110122 }
@@ -143,6 +155,7 @@ private boolean checkUsermap(File file) {
143155 lineChecked = true ;
144156 String line = scanner .nextLine ();
145157 if (line .contains (uuid )) {
158+ debug ("usermap contains UUID" );
146159 return false ;
147160 }
148161 }
@@ -206,7 +219,7 @@ private boolean deleteFile(File file) {
206219
207220 private boolean moveFile (File file ) {
208221 try {
209- if (file .renameTo (new File (main .getDataFolder () + File .separator + "userdata\\ " + file .getName ()))) {
222+ if (file .renameTo (new File (main .getDataFolder () + File .separator + "userdata" + File . separator + file .getName ()))) {
210223 if (main .inform ) {
211224 Bukkit .getServer ().getConsoleSender ().sendMessage ("Moved essential userdata file " + file .getName ());
212225 return true ;
0 commit comments