Fixed removing entries in the new Configuration (via set(x, null))

2 files changed, 13 insertions, 1 deletions

diff --git a/src/main/java/org/bukkit/configuration/MemorySection.java b/src/main/java/org/bukkit/configuration/MemorySection.java
index b122f4f1..bf2cfb00 100644
--- a/src/main/java/org/bukkit/configuration/MemorySection.java
+++ b/src/main/java/org/bukkit/configuration/MemorySection.java
@@ -186,7 +186,11 @@ public class MemorySection implements ConfigurationSection {
         String key = split[split.length - 1];
 
         if (section == this) {
-            map.put(key, prepForStorage(value));
+            if (value == null) {
+                map.remove(key);
+            } else {
+                map.put(key, prepForStorage(value));
+            }
         } else {
             section.set(key, value);
         }
diff --git a/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java b/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java
index 144fba3a..290b7844 100644
--- a/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java
+++ b/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java
@@ -162,7 +162,15 @@ public abstract class ConfigurationSectionTest {
         ConfigurationSection section = getConfigurationSection();
         
         section.set("exists", "hello world");
+        
+        assertTrue(section.contains("exists"));
+        assertTrue(section.isSet("exists"));
         assertEquals("hello world", section.get("exists"));
+        
+        section.set("exists", null);
+        
+        assertFalse(section.contains("exists"));
+        assertFalse(section.isSet("exists"));
     }
 
     @Test