| 
														
															@@ -11,7 +11,9 @@ import java.util.List; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import java.util.Set; 
														 | 
														
														 | 
														
															 import java.util.Set; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															 public abstract class BukkitConfig { 
														 | 
														
														 | 
														
															 public abstract class BukkitConfig { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    public static final String CURRENT_CONFIG_PATCH_VER = "ConfigPatchVersion: 1"; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    public static final String CONFIG_PATCH_PREFIX = "ConfigPatchVersion:"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    public static final String CURRENT_CONFIG_PATCH_VER = "ConfigPatchVersion: 2"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    public static final char COMMENT_PREFIX = '#'; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     protected final String fileName; 
														 | 
														
														 | 
														
															     protected final String fileName; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     protected final File configFile; 
														 | 
														
														 | 
														
															     protected final File configFile; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     protected YamlConfiguration config; 
														 | 
														
														 | 
														
															     protected YamlConfiguration config; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -149,7 +151,11 @@ public abstract class BukkitConfig { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     break; 
														 | 
														
														 | 
														
															                     break; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 } 
														 | 
														
														 | 
														
															                 } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                if (line.startsWith("#")) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                //Older version, don't append this line 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                if(line.startsWith(CONFIG_PATCH_PREFIX)) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    continue; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                if (isFirstCharAsciiCharacter(line, COMMENT_PREFIX)) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     if(seenBefore.contains(line)) 
														 | 
														
														 | 
														
															                     if(seenBefore.contains(line)) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         dupedLines++; 
														 | 
														
														 | 
														
															                         dupedLines++; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     else 
														 | 
														
														 | 
														
															                     else 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -189,4 +195,19 @@ public abstract class BukkitConfig { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             ex.printStackTrace(); 
														 | 
														
														 | 
														
															             ex.printStackTrace(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    private boolean isFirstCharAsciiCharacter(String line, char character) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        if(line == null || line.isEmpty()) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            return true; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        for(Character c : line.toCharArray()) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            if(c.equals(' ')) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                continue; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            return c.equals(character); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        return false; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 } 
														 | 
														
														 | 
														
															 } 
														 |