Upstream
/
Multiverse-Core
mirror of https://github.com/Multiverse/Multiverse-Core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed unneeded crap.

This commit is contained in:
Simon Rigby 2011-03-01 19:17:06 +00:00
parent b8560a41c0
commit 466e31c9ee
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/onarandombox/MultiVerseCore/MVWorld.java
View File

@ -38,10 +38,8 @@ public class MVWorld {
public Double compression; //How stretched/compressed distances are
/**
* @param handle - If the World was loaded by MultiVerse then this will be true and means we can do
* what we wan't with it else it's only here to be read from.
*/
public MVWorld(World world, Configuration config, MultiVerseCore instance, boolean handle){
public MVWorld(World world, Configuration config, MultiVerseCore instance){
this.config = config;
this.plugin = instance;
@ -55,10 +53,9 @@ public class MVWorld {
// If MultiVerse created/loaded the World then it means we wan't to handle it as well, otherwise
// we don't touch any settings unless the user specifically asks us to.
if(handle==true){
this.alias = config.getString("worlds." + this.name + ".alias","");
this.pvp = config.getBoolean("worlds." + this.name + ".pvp", true);
}
this.alias = config.getString("worlds." + this.name + ".alias","");
this.pvp = config.getBoolean("worlds." + this.name + ".pvp", true);
this.compression = config.getDouble("worlds." + this.name + ".compression", 1.0);

12
src/com/onarandombox/MultiVerseCore/MultiVerseCore.java
View File

@ -157,19 +157,15 @@ public class MultiVerseCore extends JavaPlugin {
// You never know these days... bloody NPE's.
if(lworlds != null && lworlds.size()>0){
for (World world : lworlds){
// If it's the default world we should probably ignore outputting it as it will just be spam.
if((getServer().getWorlds().get(0).getName().equals(world.getName()))){
continue;
}
log.info(logPrefix + "Loading existing World - '" + world.getName() + "' - " + world.getEnvironment().toString()); // Output to the Log that we are loading a world, specify the name and environment type.
worlds.put(world.getName(), new MVWorld(world, MultiVerseCore.configWorlds, this, false)); // Place the World into the HashMap.
worlds.put(world.getName(), new MVWorld(world, MultiVerseCore.configWorlds, this)); // Place the World into the HashMap.
count++; // Increment the World Count.
}
}
log.info(logPrefix + count + " - existing World(s) found.");
log.info(logPrefix + count + " - World(s) found.");
List<String> worldKeys = MultiVerseCore.configWorlds.getKeys("worlds"); // Grab all the Worlds from the Config.
count = 0;
@ -208,7 +204,7 @@ public class MultiVerseCore extends JavaPlugin {
//world.setMonsterSpawn = monsters;
//world.setAnimalSpawn = animals;
//MultiVerseCore.worlds.put(worldKey, new MVWorld(world, MultiVerseCore.configWorlds, this)); // Place the World into the HashMap.
worlds.put(worldKey, new MVWorld(world, MultiVerseCore.configWorlds, this)); // Place the World into the HashMap.
count++; // Increment the World Count.
}