Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-03-10 13:49:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix pvp and a few other active settings

Browse Source
This commit is contained in:
Eric Stokes 2012-01-04 23:00:40 -07:00
parent 53c801bb81
commit 5435fca6b3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ public class MVWorld implements MultiverseWorld {
"Alias must be a valid string.")); "Alias must be a valid string."));
this.propertyList.put("color", fac.getNewProperty("color", EnglishChatColor.WHITE, "alias.color", this.propertyList.put("color", fac.getNewProperty("color", EnglishChatColor.WHITE, "alias.color",
"Sorry, 'color' must either one of: " + EnglishChatColor.getAllColors())); "Sorry, 'color' must either one of: " + EnglishChatColor.getAllColors()));
this.propertyList.put("pvp", fac.getNewProperty("pvp", true, this.propertyList.put("pvp", fac.getNewProperty("pvp", true, "pvp",
"Sorry, 'pvp' must either be:" + ChatColor.GREEN + " true " + ChatColor.WHITE + "or" + ChatColor.RED + " false" + ChatColor.WHITE + ".", "setActualPVP")); "Sorry, 'pvp' must either be:" + ChatColor.GREEN + " true " + ChatColor.WHITE + "or" + ChatColor.RED + " false" + ChatColor.WHITE + ".", "setActualPVP"));
this.propertyList.put("scale", fac.getNewProperty("scale", this.getDefaultScale(this.environment), "scale", this.propertyList.put("scale", fac.getNewProperty("scale", this.getDefaultScale(this.environment), "scale",
"Scale must be a positive double value. ex: " + ChatColor.GOLD + "2.3", "verifyScaleSetProperly")); "Scale must be a positive double value. ex: " + ChatColor.GOLD + "2.3", "verifyScaleSetProperly"));
@ -201,13 +201,13 @@ public class MVWorld implements MultiverseWorld {
} }
} }
private boolean setActualPVP() { public boolean setActualPVP() {
// Set the PVP mode // Set the PVP mode
this.world.setPVP(this.getKnownProperty("pvp", Boolean.class).getValue()); this.world.setPVP(this.getKnownProperty("pvp", Boolean.class).getValue());
return true; return true;
} }
private boolean verifyScaleSetProperly() { public boolean verifyScaleSetProperly() {
// Ensure the scale is above 0 // Ensure the scale is above 0
if (this.getKnownProperty("scale", Double.class).getValue() <= 0) { if (this.getKnownProperty("scale", Double.class).getValue() <= 0) {
// Disallow negative or 0 scalings. // Disallow negative or 0 scalings.
@ -217,13 +217,13 @@ public class MVWorld implements MultiverseWorld {
return true; return true;
} }
private boolean setActualKeepSpawnInMemory() { public boolean setActualKeepSpawnInMemory() {
// Ensure the memory setting is correct // Ensure the memory setting is correct
this.world.setKeepSpawnInMemory(this.getKnownProperty("memory", Boolean.class).getValue()); this.world.setKeepSpawnInMemory(this.getKnownProperty("memory", Boolean.class).getValue());
return true; return true;
} }
private boolean setActualSpawn() { public boolean setActualSpawn() {
// Set the spawn location // Set the spawn location
Location spawnLocation = this.getKnownProperty("spawn", Location.class).getValue(); Location spawnLocation = this.getKnownProperty("spawn", Location.class).getValue();
this.getCBWorld().setSpawnLocation(spawnLocation.getBlockX(), spawnLocation.getBlockY(), spawnLocation.getBlockZ()); this.getCBWorld().setSpawnLocation(spawnLocation.getBlockX(), spawnLocation.getBlockY(), spawnLocation.getBlockZ());
@ -519,10 +519,13 @@ public class MVWorld implements MultiverseWorld {
return true; return true;
} }
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
System.out.println(e);
return false; return false;
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
System.out.println(e);
return false; return false;
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
System.out.println(e);
return false; return false;
} }
} }