From 987e2eff51304d1af23c5383c56fc2d8a9eb82cf Mon Sep 17 00:00:00 2001 From: Eric Stokes Date: Sun, 16 Oct 2011 09:41:47 -0600 Subject: [PATCH] Reorder the loading of fakepvp so it doesn't override regular pvp. --- src/main/java/com/onarandombox/MultiverseCore/MVWorld.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java index b2684c82..210c0357 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java @@ -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);