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

Move Mode to page 1: Closes #111, Fix nether imports not defaulting to 8: Closes #103.

Browse Source
This commit is contained in:
Eric Stokes 2011-09-17 07:35:39 -06:00
parent a2c6dad243
commit b39098a592
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ public class MVWorld {
this.setAlias(config.getString("worlds." + this.name + ".alias.name", "")); this.setAlias(config.getString("worlds." + this.name + ".alias.name", ""));
this.setAliasColor(config.getString("worlds." + this.name + ".alias.color", ChatColor.WHITE.toString())); this.setAliasColor(config.getString("worlds." + this.name + ".alias.color", ChatColor.WHITE.toString()));
this.setPvp(config.getBoolean("worlds." + this.name + ".pvp", true)); this.setPvp(config.getBoolean("worlds." + this.name + ".pvp", true));
this.setScaling(config.getDouble("worlds." + this.name + ".scale", 1.0)); this.setScaling(config.getDouble("worlds." + this.name + ".scale", this.getDefaultScale(this.environment)));
this.setRespawnToWorld(config.getString("worlds." + this.name + ".respawnworld", "")); this.setRespawnToWorld(config.getString("worlds." + this.name + ".respawnworld", ""));
this.setEnableWeather(config.getBoolean("worlds." + this.name + ".allowweather", true)); this.setEnableWeather(config.getBoolean("worlds." + this.name + ".allowweather", true));
@ -161,6 +161,13 @@ public class MVWorld {
} }
} }
private double getDefaultScale(Environment environment) {
if(environment == Environment.NETHER) {
return 8.0;
}
return 1.0;
}
private void setEnableWeather(boolean weather) { private void setEnableWeather(boolean weather) {
this.allowWeather = weather; this.allowWeather = weather;
// Disable any current weather // Disable any current weather

4
src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java
View File

@ -3,6 +3,7 @@ package com.onarandombox.MultiverseCore.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.sun.xml.internal.ws.util.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -97,7 +98,7 @@ public class InfoCommand extends MultiverseCommand {
message.add(new FancyHeader("General Info", colors)); message.add(new FancyHeader("General Info", colors));
message.add(new FancyMessage("World Name: ", world.getName(), colors)); message.add(new FancyMessage("World Name: ", world.getName(), colors));
message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors)); message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
message.add(new FancyMessage("Seed: ", world.getCBWorld().getSeed() + "", colors)); message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors));
Location spawn = world.getSpawnLocation(); Location spawn = world.getSpawnLocation();
message.add(new FancyMessage("Spawn Location: ", LocationManipulation.strCoords(spawn), colors)); message.add(new FancyMessage("Spawn Location: ", LocationManipulation.strCoords(spawn), colors));
message.add(new FancyMessage("World Scale: ", world.getScaling().toString(), colors)); message.add(new FancyMessage("World Scale: ", world.getScaling().toString(), colors));
@ -123,7 +124,6 @@ public class InfoCommand extends MultiverseCommand {
message.add(new FancyHeader("More World Settings", colors)); message.add(new FancyHeader("More World Settings", colors));
message.add(new FancyMessage("Weather: ", world.getWeatherEnabled() + "", colors)); message.add(new FancyMessage("Weather: ", world.getWeatherEnabled() + "", colors));
message.add(new FancyMessage("Keep spawn in memory: ", world.getKeepSpawnInMemory() + "", colors)); message.add(new FancyMessage("Keep spawn in memory: ", world.getKeepSpawnInMemory() + "", colors));
message.add(new FancyMessage("Game Mode:", world.getGameMode().toString(), colors));
message.add(new FancyHeader("PVP Settings", colors)); message.add(new FancyHeader("PVP Settings", colors));
message.add(new FancyMessage("Multiverse Setting: ", world.getPvp().toString(), colors)); message.add(new FancyMessage("Multiverse Setting: ", world.getPvp().toString(), colors));
message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getPVP() + "", colors)); message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getPVP() + "", colors));

5
src/main/java/com/onarandombox/utils/MVLevel.java
View File

@ -1,5 +0,0 @@
package com.onarandombox.utils;
public class MVLevel {
}