Merge branch 'master' of github.com:Multiverse/Multiverse-Core into new-tests

src/main/java/com/onarandombox/MultiverseCore/MVWorld.java

@@ -236,7 +236,16 @@ public class MVWorld implements MultiverseWorld {
      */
     public boolean setActualKeepSpawnInMemory() {
         // Ensure the memory setting is correct
-        this.world.setKeepSpawnInMemory(this.getKnownProperty("memory", Boolean.class).getValue());
+        this.getCBWorld().setKeepSpawnInMemory(this.getKnownProperty("memory", Boolean.class).getValue());
+        return true;
+    }
+
+    /**
+     * Used by the active difficulty-property to set the "actual" property.
+     * @return True if the property was successfully set.
+     */
+    public boolean setActualDifficulty() {
+        this.getCBWorld().setDifficulty(this.getKnownProperty("difficulty", Difficulty.class).getValue());
         return true;
     }
 

src/main/java/com/onarandombox/MultiverseCore/configuration/DifficultyConfigProperty.java

@@ -106,7 +106,7 @@ public class DifficultyConfigProperty implements MVActiveConfigProperty<Difficul
      */
     @Override
     public String getMethod() {
-        return "setDifficulty";
+        return "setActualDifficulty";
     }
 
     /**