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

Reorder the loading of fakepvp so it doesn't override regular pvp.

Browse Source
This commit is contained in:
Eric Stokes 2011-10-16 09:41:47 -06:00
parent 56926dc14c
commit 987e2eff51
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,12 +96,11 @@ public class MVWorld implements MultiverseWorld {
}
worldSection.set("environment", this.environment.toString());
// Set local values that CAN be changed by the user
this.setAlias(worldSection.getString("alias.name", ""));
this.setColor(worldSection.getString("alias.color", ChatColor.WHITE.toString()));
this.setFakePVPMode(worldSection.getBoolean("fakepvp", false));
this.setPVPMode(worldSection.getBoolean("pvp", true));
this.setFakePVPMode(worldSection.getBoolean("fakepvp", false));
this.setScaling(worldSection.getDouble("scale", this.getDefaultScale(this.environment)));
this.setRespawnToWorld(worldSection.getString("respawnworld", ""));
this.setEnableWeather(worldSection.getBoolean("allowweather", true));
@ -123,7 +122,7 @@ public class MVWorld implements MultiverseWorld {
this.translateTempSpawn(worldSection);
this.readSpawnFromConfig(this.getCBWorld());
this.canSave = true;
saveConfig();
this.saveConfig();
this.permission = new Permission("multiverse.access." + this.getName(), "Allows access to " + this.getName(), PermissionDefault.OP);
this.exempt = new Permission("multiverse.exempt." + this.getName(), "A player who has this does not pay to enter this world, or use any MV portals in it " + this.getName(), PermissionDefault.OP);