Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-07 03:11:02 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
main() 2012-01-11 16:44:59 +01:00
commit 8bab4ae606
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
View File

@ -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;
}

2
src/main/java/com/onarandombox/MultiverseCore/configuration/DifficultyConfigProperty.java
View File

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