From 466e31c9eeb9078c66b36aa6c15582af77c73a4d Mon Sep 17 00:00:00 2001 From: Simon Rigby Date: Tue, 1 Mar 2011 19:17:06 +0000 Subject: [PATCH] Removed unneeded crap. --- src/com/onarandombox/MultiVerseCore/MVWorld.java | 11 ++++------- .../onarandombox/MultiVerseCore/MultiVerseCore.java | 12 ++++-------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/com/onarandombox/MultiVerseCore/MVWorld.java b/src/com/onarandombox/MultiVerseCore/MVWorld.java index 88670d45..46d242a6 100644 --- a/src/com/onarandombox/MultiVerseCore/MVWorld.java +++ b/src/com/onarandombox/MultiVerseCore/MVWorld.java @@ -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); diff --git a/src/com/onarandombox/MultiVerseCore/MultiVerseCore.java b/src/com/onarandombox/MultiVerseCore/MultiVerseCore.java index 85d0f18c..28dd9775 100644 --- a/src/com/onarandombox/MultiVerseCore/MultiVerseCore.java +++ b/src/com/onarandombox/MultiVerseCore/MultiVerseCore.java @@ -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 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. }