Added the numerous forms of teleport permissions.

Fixes #627.

pom.xml

@@ -185,6 +185,7 @@
                                     <include>com.dumptruckman.minecraft:buscript</include>
                                     <include>org.mcstats:metrics</include>
                                     <include>com.dumptruckman.minecraft:Logging</include>
+                                    <include>com.dumptruckman.minecraft:Permissions-Bukkit</include>
                                     <include>com.fernferret.allpay:AllPay</include>
                                 </includes>
                             </artifactSet>
@@ -213,6 +214,10 @@
                                     <pattern>com.dumptruckman.minecraft.util.Logging</pattern>
                                     <shadedPattern>com.onarandombox.MultiverseCore.utils.CoreLogging</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.dumptruckman.minecraft.pluginbase</pattern>
+                                    <shadedPattern>com.onarandombox.MultiverseCore.pluginbase</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>com.dumptruckman.minecraft.util.DebugLog</pattern>
                                     <shadedPattern>com.onarandombox.MultiverseCore.utils.DebugFileLogger</shadedPattern>
@@ -230,7 +235,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.3.2-R2.1-SNAPSHOT</version>
+            <version>1.4.5-R0.2</version>
             <!-- If you want the lates, use this -->
             <!-- <version>LATEST</version> -->
             <type>jar</type>
@@ -248,7 +253,7 @@
         <dependency>
             <groupId>me.main__.util</groupId>
             <artifactId>SerializationConfig</artifactId>
-            <version>1.6c</version>
+            <version>1.7</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
@@ -305,6 +310,15 @@
             <scope>compile</scope>
         </dependency>
         <!-- End of Logging Dependency -->
+        <!-- Start of Permissions lib Dependency -->
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>Permissions-Bukkit</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <!-- End of Permissions lib Dependency -->
         <!-- Start of Test Dependencies -->
         <dependency>
             <groupId>junit</groupId>

src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java

@@ -8,9 +8,11 @@
 package com.onarandombox.MultiverseCore;
 
 import buscript.Buscript;
+import com.dumptruckman.minecraft.pluginbase.permission.BukkitPermFactory;
 import com.dumptruckman.minecraft.util.Logging;
 import com.fernferret.allpay.AllPay;
 import com.fernferret.allpay.GenericBank;
+import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.Core;
 import com.onarandombox.MultiverseCore.api.LocationManipulation;
@@ -30,6 +32,8 @@ import com.onarandombox.MultiverseCore.commands.CreateCommand;
 import com.onarandombox.MultiverseCore.commands.DebugCommand;
 import com.onarandombox.MultiverseCore.commands.DeleteCommand;
 import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
+import com.onarandombox.MultiverseCore.commands.GameruleCommand;
+import com.onarandombox.MultiverseCore.commands.GamerulesCommand;
 import com.onarandombox.MultiverseCore.commands.GeneratorCommand;
 import com.onarandombox.MultiverseCore.commands.HelpCommand;
 import com.onarandombox.MultiverseCore.commands.ImportCommand;
@@ -61,10 +65,10 @@ import com.onarandombox.MultiverseCore.destination.ExactDestination;
 import com.onarandombox.MultiverseCore.destination.PlayerDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
-import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
 import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
+import com.onarandombox.MultiverseCore.listeners.MVMapListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
 import com.onarandombox.MultiverseCore.listeners.MVPluginListener;
@@ -80,6 +84,7 @@ import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
 import com.onarandombox.MultiverseCore.utils.VaultHandler;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
 import com.pneumaticraft.commandhandler.CommandHandler;
+import me.main__.util.SerializationConfig.NoSuchPropertyException;
 import me.main__.util.SerializationConfig.SerializationConfig;
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
@@ -219,10 +224,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
     @Override
     public void onLoad() {
+        // Register permission handler
+        BukkitPermFactory.registerPermissionName(getClass(), "multiverse");
+        BukkitPermFactory.registerPermissionName(Core.class, "multiverse");
         // Register our config
         SerializationConfig.registerAll(MultiverseCoreConfiguration.class);
         // Register our world
-        SerializationConfig.registerAll(MVWorld.class);
+        SerializationConfig.registerAll(WorldProperties.class);
         // Create our DataFolder
         getDataFolder().mkdirs();
         // Setup our Debug Log
@@ -462,7 +470,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         pm.registerEvents(this.pluginListener, this);
         pm.registerEvents(this.weatherListener, this);
         pm.registerEvents(this.portalListener, this);
-
+        pm.registerEvents(new MVMapListener(this), this);
     }
 
     /**
@@ -567,14 +575,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         boolean wasChanged = false;
         Map<String, Object> newValues = new LinkedHashMap<String, Object>(values.size());
         for (Map.Entry<String, Object> entry : values.entrySet()) {
-            if (entry.getValue() instanceof MVWorld) {
+            if (entry.getValue() instanceof WorldProperties) {
                 // fine
                 newValues.put(entry.getKey(), entry.getValue());
             } else if (entry.getValue() instanceof ConfigurationSection) {
                 this.log(Level.FINE, "Migrating: " + entry.getKey());
                 // we have to migrate this
-                MVWorld world = new MVWorld(Collections.EMPTY_MAP);
-                world.setPluginAndWorld(this, entry.getKey());
+                WorldProperties world = new WorldProperties(Collections.EMPTY_MAP);
                 ConfigurationSection section = (ConfigurationSection) entry.getValue();
 
                 // migrate animals and monsters
@@ -668,8 +675,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 // migrate portalform
                 if (section.isString("portalform")) {
                     try {
-                        world.setPropertyValue("portalform", section.getString("portalform"));
-                    } catch (PropertyDoesNotExistException e) {
+                        world.setProperty("portalform", section.getString("portalform"), true);
+                    } catch (NoSuchPropertyException e) {
                         throw new RuntimeException("Who forgot to update the migrator?", e);
                     }
                 }
@@ -677,8 +684,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 // migrate environment
                 if (section.isString("environment")) {
                     try {
-                        world.setPropertyValue("environment", section.getString("environment"));
-                    } catch (PropertyDoesNotExistException e) {
+                        world.setProperty("environment", section.getString("environment"), true);
+                    } catch (NoSuchPropertyException e) {
                         throw new RuntimeException("Who forgot to update the migrator?", e);
                     }
                 }
@@ -716,7 +723,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 // migrate spawn
                 if (section.isConfigurationSection("spawn")) {
                     ConfigurationSection spawnSect = section.getConfigurationSection("spawn");
-                    Location spawnLoc = world.getSpawnLocation();
+                    Location spawnLoc = new NullLocation();
                     if (spawnSect.isDouble("yaw"))
                         spawnLoc.setYaw((float) spawnSect.getDouble("yaw"));
                     if (spawnSect.isDouble("pitch"))
@@ -822,6 +829,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         this.commandHandler.registerCommand(new GeneratorCommand(this));
         this.commandHandler.registerCommand(new CheckCommand(this));
         this.commandHandler.registerCommand(new ScriptCommand(this));
+        this.commandHandler.registerCommand(new GameruleCommand(this));
+        this.commandHandler.registerCommand(new GamerulesCommand(this));
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java

@@ -63,6 +63,10 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     private volatile String firstspawnworld;
     @Property
     private volatile int teleportcooldown;
+    @Property
+    private volatile boolean defaultportalsearch;
+    @Property
+    private volatile int portalsearchradius;
 
     public MultiverseCoreConfiguration() {
         super();
@@ -91,6 +95,8 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         teleportcooldown = 1000;
         this.version = 2.9;
         silentstart = false;
+        defaultportalsearch = false;
+        portalsearchradius = 16;
         // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
     }
 
@@ -289,4 +295,24 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     public boolean getSilentStart() {
         return silentstart;
     }
+
+    @Override
+    public void setUseDefaultPortalSearch(boolean useDefaultPortalSearch) {
+        defaultportalsearch = useDefaultPortalSearch;
+    }
+
+    @Override
+    public boolean isUsingDefaultPortalSearch() {
+        return defaultportalsearch;
+    }
+
+    @Override
+    public void setPortalSearchRadius(int searchRadius) {
+        this.portalsearchradius = searchRadius;
+    }
+
+    @Override
+    public int getPortalSearchRadius() {
+        return portalsearchradius;
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/WorldProperties.java

@@ -0,0 +1,633 @@
+package com.onarandombox.MultiverseCore;
+
+import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
+import com.onarandombox.MultiverseCore.configuration.EntryFee;
+import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
+import com.onarandombox.MultiverseCore.configuration.SpawnSettings;
+import com.onarandombox.MultiverseCore.configuration.WorldPropertyValidator;
+import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import com.onarandombox.MultiverseCore.enums.EnglishChatStyle;
+import me.main__.util.SerializationConfig.IllegalPropertyValueException;
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+import me.main__.util.SerializationConfig.Serializor;
+import me.main__.util.SerializationConfig.Validator;
+import me.main__.util.SerializationConfig.VirtualProperty;
+import org.bukkit.ChatColor;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.World.Environment;
+import org.bukkit.configuration.serialization.SerializableAs;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@SerializableAs("MVWorld")
+public class WorldProperties extends SerializationConfig {
+
+    private static final Map<String, String> PROPERTY_ALIASES;
+
+    static {
+        PROPERTY_ALIASES = new HashMap<String, String>();
+        PROPERTY_ALIASES.put("curr", "currency");
+        PROPERTY_ALIASES.put("scaling", "scale");
+        PROPERTY_ALIASES.put("aliascolor", "color");
+        PROPERTY_ALIASES.put("heal", "autoHeal");
+        PROPERTY_ALIASES.put("storm", "allowWeather");
+        PROPERTY_ALIASES.put("weather", "allowWeather");
+        PROPERTY_ALIASES.put("spawnmemory", "keepSpawnInMemory");
+        PROPERTY_ALIASES.put("memory", "keepSpawnInMemory");
+        PROPERTY_ALIASES.put("mode", "gameMode");
+        PROPERTY_ALIASES.put("diff", "difficulty");
+        PROPERTY_ALIASES.put("spawnlocation", "spawn");
+        PROPERTY_ALIASES.put("limit", "playerLimit");
+        PROPERTY_ALIASES.put("animals", "spawning.animals.spawn");
+        PROPERTY_ALIASES.put("monsters", "spawning.monsters.spawn");
+        PROPERTY_ALIASES.put("animalsrate", "spawning.animals.spawnrate");
+        PROPERTY_ALIASES.put("monstersrate", "spawning.monsters.spawnrate");
+        PROPERTY_ALIASES.put("flight", "allowFlight");
+        PROPERTY_ALIASES.put("fly", "allowFlight");
+        PROPERTY_ALIASES.put("allowfly", "allowFlight");
+    }
+
+    public WorldProperties(Map<String, Object> values) {
+        super(values);
+    }
+
+    public WorldProperties() {
+        super();
+    }
+
+    public WorldProperties(final boolean fixSpawn, final Environment environment) {
+        super();
+        if (!fixSpawn) {
+            this.adjustSpawn = false;
+        }
+        setScaling(getDefaultScale(environment));
+    }
+
+    void setMVWorld(MVWorld world) {
+        registerObjectUsing(world);
+        registerGlobalValidator(new WorldPropertyValidator());
+    }
+
+    /**
+     * Serializor for the color-property.
+     */
+    private static final class EnumPropertySerializor<T extends Enum<T>> implements Serializor<T, String> {
+        @Override
+        public String serialize(T from) {
+            return from.toString();
+        }
+
+        @Override
+        public T deserialize(String serialized, Class<T> wanted) throws IllegalPropertyValueException {
+            try {
+                return Enum.valueOf(wanted, serialized.toUpperCase());
+            } catch (IllegalArgumentException e) {
+                throw new IllegalPropertyValueException(e);
+            }
+        }
+    }
+
+    /**
+     * Serializor for the difficulty-property.
+     */
+    private static final class DifficultyPropertySerializor implements Serializor<Difficulty, String> {
+        @Override
+        public String serialize(Difficulty from) {
+            return from.toString();
+        }
+
+        @Override
+        public Difficulty deserialize(String serialized, Class<Difficulty> wanted) throws IllegalPropertyValueException {
+            try {
+                return Difficulty.getByValue(Integer.parseInt(serialized));
+            } catch (Exception e) {
+            }
+            try {
+                return Difficulty.valueOf(serialized.toUpperCase());
+            } catch (Exception e) {
+            }
+            throw new IllegalPropertyValueException();
+        }
+    }
+
+    /**
+     * Serializor for the gameMode-property.
+     */
+    private static final class GameModePropertySerializor implements Serializor<GameMode, String> {
+        @Override
+        public String serialize(GameMode from) {
+            return from.toString();
+        }
+
+        @Override
+        public GameMode deserialize(String serialized, Class<GameMode> wanted) throws IllegalPropertyValueException {
+            try {
+                return GameMode.getByValue(Integer.parseInt(serialized));
+            } catch (NumberFormatException nfe) {
+            }
+            try {
+                return GameMode.valueOf(serialized.toUpperCase());
+            } catch (Exception e) {
+            }
+            throw new IllegalPropertyValueException();
+        }
+    }
+
+    /**
+     * Serializor for the time-property.
+     */
+    private static final class TimePropertySerializor implements Serializor<Long, String> {
+        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+        private static final String TIME_REGEX = "(\\d\\d?):?(\\d\\d)(a|p)?m?";
+        private static final  Map<String, String> TIME_ALIASES;
+        static {
+            Map<String, String> staticTimes = new HashMap<String, String>();
+            staticTimes.put("morning", "8:00");
+            staticTimes.put("day", "12:00");
+            staticTimes.put("noon", "12:00");
+            staticTimes.put("midnight", "0:00");
+            staticTimes.put("night", "20:00");
+
+            // now set TIME_ALIASES to a "frozen" map
+            TIME_ALIASES = Collections.unmodifiableMap(staticTimes);
+        }
+
+        @Override
+        public String serialize(Long from) {
+            // I'm tired, so they get time in 24 hour for now.
+            // Someone else can add 12 hr format if they want :P
+
+            int hours = (int) ((from / 1000 + 8) % 24);
+            int minutes = (int) (60 * (from % 1000) / 1000);
+
+            return String.format("%d:%02d", hours, minutes);
+        }
+
+        @Override
+        public Long deserialize(String serialized, Class<Long> wanted) throws IllegalPropertyValueException {
+            if (TIME_ALIASES.containsKey(serialized.toLowerCase())) {
+                serialized = TIME_ALIASES.get(serialized.toLowerCase());
+            }
+            // Regex that extracts a time in the following formats:
+            // 11:11pm, 11:11, 23:11, 1111, 1111p, and the aliases at the top of this file.
+            Pattern pattern = Pattern.compile(TIME_REGEX, Pattern.CASE_INSENSITIVE);
+            Matcher matcher = pattern.matcher(serialized);
+            matcher.find();
+            int hour = 0;
+            double minute = 0;
+            int count = matcher.groupCount();
+            if (count >= 2) {
+                hour = Integer.parseInt(matcher.group(1));
+                minute = Integer.parseInt(matcher.group(2));
+            }
+            // If there were 4 matches (all, hour, min, am/pm)
+            if (count == 4) {
+                // We want 24 hour time for calcs, but if they
+                // added a p[m], turn it into a 24 hr one.
+                if (matcher.group(3).equals("p")) {
+                    hour += 12;
+                }
+            }
+            // Translate 24th hour to 0th hour.
+            if (hour == 24) {
+                hour = 0;
+            }
+            // Clamp the hour
+            if (hour > 23 || hour < 0) {
+                throw new IllegalPropertyValueException("Illegal hour!");
+            }
+            // Clamp the minute
+            if (minute > 59 || minute < 0) {
+                throw new IllegalPropertyValueException("Illegal minute!");
+            }
+            // 60 seconds in a minute, time needs to be in hrs * 1000, per
+            // the bukkit docs.
+            double totaltime = (hour + (minute / 60.0)) * 1000;
+            // Somehow there's an 8 hour offset...
+            totaltime -= 8000;
+            if (totaltime < 0) {
+                totaltime = 24000 + totaltime;
+            }
+
+            return (long) totaltime;
+        }
+        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+    }
+
+    // --------------------------------------------------------------
+    // Begin properties
+    @Property(description = "Sorry, 'hidden' must either be: true or false.")
+    private volatile boolean hidden;
+    @Property(description = "Alias must be a valid string.")
+    private volatile String alias;
+    @Property(serializor = EnumPropertySerializor.class, description = "Sorry, 'color' must be a valid color-name.")
+    private volatile EnglishChatColor color;
+    @Property(serializor = EnumPropertySerializor.class, description = "Sorry, 'style' must be a valid style-name.")
+    private volatile EnglishChatStyle style;
+    @Property(description = "Sorry, 'pvp' must either be: true or false.", virtualType = Boolean.class, persistVirtual = true)
+    volatile VirtualProperty<Boolean> pvp;
+    @Property(description = "Scale must be a positive double value. ex: 2.3")
+    private volatile double scale;
+    @Property(description = "You must set this to the NAME not alias of a world.")
+    private volatile String respawnWorld;
+    @Property(description = "Sorry, this must either be: true or false.")
+    private volatile boolean allowWeather;
+    @Property(serializor = DifficultyPropertySerializor.class, virtualType = Difficulty.class, persistVirtual = true,
+            description = "Difficulty must be set as one of the following: peaceful easy normal hard")
+    volatile VirtualProperty<Difficulty> difficulty;
+    @Property(description = "Sorry, 'animals' must either be: true or false.")
+    private volatile SpawnSettings spawning;
+    @Property
+    private volatile EntryFee entryfee;
+    @Property(description = "Sorry, 'hunger' must either be: true or false.")
+    private volatile boolean hunger;
+    @Property(description = "Sorry, 'autoheal' must either be: true or false.")
+    private volatile boolean autoHeal;
+    @Property(description = "Sorry, 'adjustspawn' must either be: true or false.")
+    private volatile boolean adjustSpawn;
+    @Property(serializor = EnumPropertySerializor.class, description = "Allow portal forming must be NONE, ALL, NETHER or END.")
+    private volatile AllowedPortalType portalForm;
+    @Property(serializor = GameModePropertySerializor.class, description = "GameMode must be set as one of the following: survival creative")
+    private volatile GameMode gameMode;
+    @Property(description = "Sorry, this must either be: true or false.", virtualType = Boolean.class, persistVirtual = true)
+    volatile VirtualProperty<Boolean> keepSpawnInMemory;
+    @Property
+    volatile SpawnLocation spawnLocation;
+    @Property(virtualType = Location.class,
+            description = "There is no help available for this variable. Go bug Rigby90 about it.")
+    volatile VirtualProperty<Location> spawn;
+    @Property(description = "Set this to false ONLY if you don't want this world to load itself on server restart.")
+    private volatile boolean autoLoad;
+    @Property(description = "If a player dies in this world, shoudld they go to their bed?")
+    private volatile boolean bedRespawn;
+    @Property
+    private volatile List<String> worldBlacklist;
+    @Property(serializor = TimePropertySerializor.class, virtualType = Long.class,
+            description = "Set the time to whatever you want! (Will NOT freeze time)")
+    volatile VirtualProperty<Long> time;
+    @Property
+    volatile Environment environment;
+    @Property
+    volatile long seed;
+    @Property
+    private volatile String generator;
+    @Property
+    private volatile int playerLimit;
+    @Property
+    private volatile boolean allowFlight;
+    // End of properties
+    // --------------------------------------------------------------
+
+    void setValidator(String fieldName, Validator validator) {
+        registerValidator(fieldName, validator);    //To change body of overridden methods use File | Settings | File Templates.
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void copyValues(SerializationConfig other) {
+        super.copyValues(other);
+    }
+
+    /**
+     * This prepares the MVWorld for unloading.
+     */
+    public void cacheVirtualProperties() {
+        try {
+            this.buildVPropChanges();
+        } catch (IllegalStateException e) {
+            // do nothing
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setDefaults() {
+        this.hidden = false;
+        this.alias = new String();
+        this.color = EnglishChatColor.WHITE;
+        this.style = EnglishChatStyle.NORMAL;
+        this.scale = 1D;
+        this.respawnWorld = new String();
+        this.allowWeather = true;
+        this.spawning = new SpawnSettings();
+        this.entryfee = new EntryFee();
+        this.hunger = true;
+        this.autoHeal = true;
+        this.adjustSpawn = true;
+        this.portalForm = AllowedPortalType.ALL;
+        this.gameMode = GameMode.SURVIVAL;
+        this.spawnLocation = new NullLocation();
+        this.autoLoad = true;
+        this.bedRespawn = true;
+        this.worldBlacklist = new ArrayList<String>();
+        this.generator = null;
+        this.playerLimit = -1;
+        this.allowFlight = true;
+    }
+
+    private static double getDefaultScale(Environment environment) {
+        if (environment == Environment.NETHER) {
+            return 8.0; // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        } else if (environment == Environment.THE_END) {
+            return 16.0; // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        }
+        return 1.0;
+    }
+
+    /**
+     * getAliases().
+     * @return The alias-map.
+     * @see SerializationConfig
+     */
+    protected static Map<String, String> getAliases() {
+        return PROPERTY_ALIASES;
+    }
+
+    void flushChanges() {
+        this.flushPendingVPropChanges();
+    }
+
+    String getAlias() {
+        return this.alias;
+    }
+
+    public void setAlias(String alias) {
+        this.setPropertyValueUnchecked("alias", alias);
+    }
+
+    public Environment getEnvironment() {
+        return this.environment;
+    }
+
+    public void setEnvironment(Environment environment) {
+        this.setPropertyValueUnchecked("environment", environment);
+    }
+
+    public long getSeed() {
+        return this.seed;
+    }
+
+    public void setSeed(long seed) {
+        this.setPropertyValueUnchecked("seed", seed);
+    }
+
+    public String getGenerator() {
+        return this.generator;
+    }
+
+    public void setGenerator(String generator) {
+        this.setPropertyValueUnchecked("generator", generator);
+    }
+
+    public int getPlayerLimit() {
+        return this.playerLimit;
+    }
+
+    public void setPlayerLimit(int limit) {
+        this.setPropertyValueUnchecked("playerLimit", limit);
+    }
+
+    public boolean canAnimalsSpawn() {
+        return this.spawning.getAnimalSettings().doSpawn();
+    }
+
+    public void setAllowAnimalSpawn(boolean animals) {
+        this.setPropertyValueUnchecked("spawning.animals.spawn", animals);
+    }
+
+    public List<String> getAnimalList() {
+        // These don't fire events at the moment. Should they?
+        return this.spawning.getAnimalSettings().getExceptions();
+    }
+
+    public boolean canMonstersSpawn() {
+        return this.spawning.getMonsterSettings().doSpawn();
+    }
+
+    public void setAllowMonsterSpawn(boolean monsters) {
+        this.setPropertyValueUnchecked("spawning.monsters.spawn", monsters);
+    }
+
+    public int getAnimalSpawnRate() {
+        return this.spawning.getAnimalSettings().getSpawnRate();
+    }
+
+    public int getMonsterSpawnRate() {
+        return this.spawning.getMonsterSettings().getSpawnRate();
+    }
+
+    public List<String> getMonsterList() {
+        // These don't fire events at the moment. Should they?
+        return this.spawning.getMonsterSettings().getExceptions();
+    }
+
+    public boolean isPVPEnabled() {
+        return this.pvp.get();
+    }
+
+    public void setPVPMode(boolean pvp) {
+        this.setPropertyValueUnchecked("pvp", pvp);
+    }
+
+    public boolean isHidden() {
+        return this.hidden;
+    }
+
+    public void setHidden(boolean hidden) {
+        this.setPropertyValueUnchecked("hidden", hidden);
+    }
+
+    public List<String> getWorldBlacklist() {
+        return this.worldBlacklist;
+    }
+
+    public double getScaling() {
+        return this.scale;
+    }
+
+    public boolean setScaling(double scaling) {
+        return this.setPropertyValueUnchecked("scale", scaling);
+    }
+
+    public boolean setColor(String aliasColor) {
+        return this.setPropertyUnchecked("color", aliasColor);
+    }
+
+    public boolean setColor(EnglishChatColor color) {
+        return this.setPropertyValueUnchecked("color", color);
+    }
+
+    public EnglishChatColor getColor() {
+        return this.color;
+    }
+
+    public String getRespawnToWorld() {
+        return this.respawnWorld;
+    }
+
+    public boolean setRespawnToWorld(String respawnToWorld) {
+        return this.setPropertyValueUnchecked("respawnWorld", respawnToWorld);
+    }
+
+    public int getCurrency() {
+        return this.entryfee.getCurrency();
+    }
+
+    public void setCurrency(int currency) {
+        this.setPropertyValueUnchecked("entryfee.currency", currency);
+    }
+
+    public double getPrice() {
+        return this.entryfee.getAmount();
+    }
+
+    public void setPrice(double price) {
+        this.setPropertyValueUnchecked("entryfee.amount", price);
+    }
+
+    public boolean setGameMode(String mode) {
+        return this.setPropertyUnchecked("gameMode", mode);
+    }
+
+    public boolean setGameMode(GameMode mode) {
+        return this.setPropertyValueUnchecked("gameMode", mode);
+    }
+
+    public GameMode getGameMode() {
+        return this.gameMode;
+    }
+
+    public void setEnableWeather(boolean weather) {
+        this.setPropertyValueUnchecked("allowWeather", weather);
+    }
+
+    public boolean isWeatherEnabled() {
+        return this.allowWeather;
+    }
+
+    public boolean isKeepingSpawnInMemory() {
+        return this.keepSpawnInMemory.get();
+    }
+
+    public void setKeepSpawnInMemory(boolean value) {
+        this.setPropertyValueUnchecked("keepSpawnInMemory", value);
+    }
+
+    public boolean getHunger() {
+        return this.hunger;
+    }
+
+    public void setHunger(boolean hunger) {
+        this.setPropertyValueUnchecked("hunger", hunger);
+    }
+
+    public Location getSpawnLocation() {
+        return this.spawn.get();
+    }
+
+    public void setSpawnLocation(Location l) {
+        this.setPropertyValueUnchecked("spawn", l);
+    }
+
+    public Difficulty getDifficulty() {
+        return this.difficulty.get();
+    }
+
+    @Deprecated
+    public boolean setDifficulty(String difficulty) {
+        return this.setPropertyUnchecked("difficulty", difficulty);
+    }
+
+    public boolean setDifficulty(Difficulty difficulty) {
+        return this.setPropertyValueUnchecked("difficulty", difficulty);
+    }
+
+    public boolean getAutoHeal() {
+        return this.autoHeal;
+    }
+
+    public void setAutoHeal(boolean heal) {
+        this.setPropertyValueUnchecked("autoHeal", heal);
+    }
+
+    public void setAdjustSpawn(boolean adjust) {
+        this.setPropertyValueUnchecked("adjustSpawn", adjust);
+    }
+
+    public boolean getAdjustSpawn() {
+        return this.adjustSpawn;
+    }
+
+    public void setAutoLoad(boolean load) {
+        this.setPropertyValueUnchecked("autoLoad", load);
+    }
+
+    public boolean getAutoLoad() {
+        return this.autoLoad;
+    }
+
+    public void setBedRespawn(boolean respawn) {
+        this.setPropertyValueUnchecked("bedRespawn", respawn);
+    }
+
+    public boolean getBedRespawn() {
+        return this.bedRespawn;
+    }
+
+    public String getAllPropertyNames() {
+        ChatColor myColor = ChatColor.AQUA;
+        StringBuilder result = new StringBuilder();
+        Map<String, Object> serialized = this.serialize();
+        for (String key : serialized.keySet()) {
+            result.append(myColor).append(key).append(' ');
+            myColor = (myColor == ChatColor.AQUA) ? ChatColor.GOLD : ChatColor.AQUA;
+        }
+        return result.toString();
+    }
+
+    public String getTime() {
+        return this.getPropertyUnchecked("time");
+    }
+
+    public boolean setTime(String timeAsString) {
+        return this.setPropertyUnchecked("time", timeAsString);
+    }
+
+    public AllowedPortalType getAllowedPortals() {
+        return portalForm;
+    }
+
+    public void allowPortalMaking(AllowedPortalType portalType) {
+        this.setPropertyValueUnchecked("portalForm", portalType);
+    }
+
+    public EnglishChatStyle getStyle() {
+        return style;
+    }
+
+    public boolean setStyle(String style) {
+        return this.setPropertyUnchecked("style", style);
+    }
+
+    public boolean getAllowFlight() {
+        return this.allowFlight;
+    }
+
+    public void setAllowFlight(final boolean allowFlight) {
+        this.setPropertyValueUnchecked("allowFlight", allowFlight);
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/api/MVDestination.java

@@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.api;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
+import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 
@@ -130,6 +131,14 @@ public interface MVDestination {
      */
     String getRequiredPermission();
 
+    /**
+     * Checks whether the given permissible has the permission to go to this destination.
+     *
+     * @param permissible Whoever we need to check permissions for.
+     * @return True if they are allowed to go to this destination based on permissions.
+     */
+    boolean hasRequiredPermission(Permissible permissible);
+
     /**
      * Should the Multiverse SafeTeleporter be used?
      * <p>

src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java

@@ -30,14 +30,14 @@ public interface MVPlugin extends LoggablePlugin {
     /**
      * Gets the reference to MultiverseCore.
      *
-     * @return A valid {@link MultiverseCore}.
+     * @return A valid {@link com.onarandombox.MultiverseCore}.
      */
     MultiverseCore getCore();
 
     /**
      * Sets the reference to MultiverseCore.
      *
-     * @param core A valid {@link MultiverseCore}.
+     * @param core A valid {@link com.onarandombox.MultiverseCore}.
      */
     void setCore(MultiverseCore core);
 

src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java

@@ -159,4 +159,32 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      * @return true if we are suppressing startup messages.
      */
     boolean getSilentStart();
+
+    /**
+     * Sets whether or not to let Bukkit determine portal search radius on its own or if Multiverse should give input.
+     *
+     * @param useDefaultPortalSearch True to let Bukkit determine portal search radius on its own.
+     */
+    void setUseDefaultPortalSearch(boolean useDefaultPortalSearch);
+
+    /**
+     * Gets whether or not Bukkit will be determining portal search radius on its own or if Multiverse should help.
+     *
+     * @return True means Bukkit will use its own default values.
+     */
+    boolean isUsingDefaultPortalSearch();
+
+    /**
+     * Sets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @param searchRadius The portal search radius.
+     */
+    void setPortalSearchRadius(int searchRadius);
+
+    /**
+     * Gets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @return The portal search radius.
+     */
+    int getPortalSearchRadius();
 }

src/main/java/com/onarandombox/MultiverseCore/api/MultiverseWorld.java

@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.api;
 
 import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
@@ -246,14 +245,18 @@ public interface MultiverseWorld {
      * Gets the permission required to enter this world.
      *
      * @return The permission required to be exempt from charges to/from this world.
+     * @deprecated Now using {@link com.onarandombox.MultiverseCore.utils.Permissions#ACCESS}.
      */
+    @Deprecated
     Permission getAccessPermission();
 
     /**
      * Gets the permission required to be exempt when entering.
      *
      * @return The permission required to be exempt when entering.
+     * @deprecated Now using {@link com.onarandombox.MultiverseCore.utils.Permissions#COST_EXEMPT}.
      */
+    @Deprecated
     Permission getExemptPermission();
     // end of permission stuff
 
@@ -685,4 +688,18 @@ public interface MultiverseWorld {
      * @return All property names, with alternating colors.
      */
     String getAllPropertyNames();
+
+    /**
+     * Whether or not players are allowed to fly in this world.
+     *
+     * @return True if players allowed to fly in this world.
+     */
+    boolean getAllowFlight();
+
+    /**
+     * Sets whether or not players are allowed to fly in this world.
+     *
+     * @param allowFlight True to allow flight in this world.
+     */
+    void setAllowFlight(final boolean allowFlight);
 }

src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java

@@ -0,0 +1,75 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GameruleCommand extends MultiverseCommand {
+
+    public GameruleCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Set a Minecraft Game Rule for a World.");
+        this.setCommandUsage("/mv gamerule " + ChatColor.GREEN + "{RULE} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(2, 3);
+        this.addKey("mv gamerule");
+        this.addKey("mv rule");
+        this.addKey("mvgamerule");
+        this.addKey("mvrule");
+        this.addCommandExample("/mv gamerule " + ChatColor.GREEN + "doMobLoot false");
+        this.addCommandExample("/mvrule " + ChatColor.GREEN + "keepInventory true " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.set", "Allows a player to set a gamerule.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final String gameRule = args.get(0);
+        final String value = args.get(1);
+        final World world;
+        if (args.size() == 2) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(2));
+        }
+
+        if (world.setGameRuleValue(gameRule, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
+        } else {
+            sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " cannot be set to " + ChatColor.RED + value);
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java

@@ -0,0 +1,76 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GamerulesCommand extends MultiverseCommand {
+
+    public GamerulesCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("List the Minecraft Game Rules for a World.");
+        this.setCommandUsage("/mv gamerules" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(0, 1);
+        this.addKey("mv gamerules");
+        this.addKey("mv rules");
+        this.addKey("mvgamerules");
+        this.addKey("mvrules");
+        this.addCommandExample("/mv gamerules");
+        this.addCommandExample("/mvrules " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.list", "Allows a player to list gamerules.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 0 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final World world;
+        if (args.size() == 0) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(0));
+        }
+
+        final StringBuilder gameRules = new StringBuilder();
+        for (final String gameRule : world.getGameRules()) {
+            if (gameRules.length() != 0) {
+                gameRules.append(ChatColor.WHITE).append(", ");
+            }
+            gameRules.append(ChatColor.AQUA).append(gameRule).append(ChatColor.WHITE).append(": ");
+            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(gameRule));
+        }
+        sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
+        sender.sendMessage(gameRules.toString());
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java

@@ -122,7 +122,8 @@ public class InfoCommand extends MultiverseCommand {
         //message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors));
         Location spawn = world.getSpawnLocation();
         message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
-        message.add(new FancyMessage("World Scale: ", world.getScaling() + "", colors));
+        message.add(new FancyMessage("World Scale: ", String.valueOf(world.getScaling()), colors));
+        message.add(new FancyMessage("World Seed: ", String.valueOf(world.getSeed()), colors));
         if (world.getPrice() > 0) {
             final String formattedAmount;
             if (world.getCurrency() <= 0 && plugin.getVaultHandler().getEconomy() != null) {

src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java

@@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
 import org.bukkit.command.CommandSender;
@@ -65,7 +66,7 @@ public class ListCommand extends PaginatedCoreCommand<String> {
             }
         }
         for (String name : this.plugin.getMVWorldManager().getUnloadedWorlds()) {
-            if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + name, true)) {
+            if (p == null || Permissions.ACCESS.hasPermission(p, name)) {
                 worldList.add(ChatColor.GRAY + name + " - UNLOADED");
             }
         }

src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java

@@ -64,6 +64,9 @@ public class SetSpawnCommand extends MultiverseCommand {
                     foundWorld.setAdjustSpawn(false);
                 }
                 sender.sendMessage("Spawn was set to: " + plugin.getLocationManipulation().strCoords(p.getLocation()));
+                if (!plugin.saveWorldConfig()) {
+                    sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+                }
             } else {
                 w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
                 sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully (Pitch/Yaws).");

src/main/java/com/onarandombox/MultiverseCore/destination/AnchorDestination.java

@@ -9,8 +9,10 @@ package com.onarandombox.MultiverseCore.destination;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
+import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 
@@ -134,7 +136,15 @@ public class AnchorDestination implements MVDestination {
      */
     @Override
     public String getRequiredPermission() {
-        return "multiverse.access." + this.location.getWorld().getName();
+        return Permissions.ACCESS.getName(this.location.getWorld().getName());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean hasRequiredPermission(Permissible permissible) {
+        return Permissions.ACCESS.hasPermission(permissible, this.location.getWorld().getName());
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java

@@ -9,10 +9,12 @@ package com.onarandombox.MultiverseCore.destination;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 
@@ -104,11 +106,22 @@ public class BedDestination implements MVDestination {
     @Override
     public String getRequiredPermission() {
         if (knownBedLoc != null) {
-            return "multiverse.access." + knownBedLoc.getWorld().getName();
+            return Permissions.ACCESS.getName(knownBedLoc.getWorld().getName());
         }
         return "";
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean hasRequiredPermission(Permissible permissible) {
+        if (knownBedLoc != null) {
+            Permissions.ACCESS.hasPermission(permissible, knownBedLoc.getWorld().getName());
+        }
+        return true;
+    }
+
     /**
      * {@inheritDoc}
      */

src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java

@@ -9,8 +9,10 @@ package com.onarandombox.MultiverseCore.destination;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
+import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 
@@ -205,7 +207,15 @@ public class CannonDestination implements MVDestination {
      */
     @Override
     public String getRequiredPermission() {
-        return "multiverse.access." + this.location.getWorld().getName();
+        return Permissions.ACCESS.getName(this.location.getWorld().getName());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean hasRequiredPermission(Permissible permissible) {
+        return Permissions.ACCESS.hasPermission(permissible, this.location.getWorld().getName());
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java

@@ -9,8 +9,10 @@ package com.onarandombox.MultiverseCore.destination;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
+import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 
@@ -208,7 +210,15 @@ public class ExactDestination implements MVDestination {
      */
     @Override
     public String getRequiredPermission() {
-        return "multiverse.access." + this.location.getWorld().getName();
+        return Permissions.ACCESS.getName(this.location.getWorld().getName());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean hasRequiredPermission(Permissible permissible) {
+        return Permissions.ACCESS.hasPermission(permissible, this.location.getWorld().getName());
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java

@@ -11,8 +11,10 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.Core;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.Permissions;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
+import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 
@@ -149,9 +151,15 @@ public class WorldDestination implements MVDestination {
      */
     @Override
     public String getRequiredPermission() {
-        // TODO: Potenitally replace spaces wiht tabs for friendlier yaml.
-        // this.world.getName().replace(" ","_");
-        return "multiverse.access." + this.world.getName();
+        return Permissions.ACCESS.getName(this.world.getName());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean hasRequiredPermission(Permissible permissible) {
+        return Permissions.ACCESS.hasPermission(permissible, this.world.getName());
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/listeners/MVMapListener.java

@@ -0,0 +1,39 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.MapInitializeEvent;
+import org.bukkit.map.MapView;
+
+/**
+ * A listener for bukkit map events.
+ */
+public class MVMapListener implements Listener {
+
+    private final MultiverseCore plugin;
+
+    public MVMapListener(final MultiverseCore plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void mapInitialize(final MapInitializeEvent event) {
+        for (final Player player : Bukkit.getOnlinePlayers()) {
+            if ((player.getItemInHand().getType() == Material.MAP
+                    || player.getItemInHand().getType() == Material.EMPTY_MAP)
+                    && player.getItemInHand().getDurability() == event.getMap().getId()) {
+                final Location playerLoc = player.getLocation();
+                final MapView map = event.getMap();
+                map.setCenterX(playerLoc.getBlockX());
+                map.setCenterZ(playerLoc.getBlockZ());
+                map.setWorld(playerLoc.getWorld());
+                return;
+            }
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java

@@ -13,6 +13,8 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
+import com.onarandombox.MultiverseCore.utils.Permissions;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -119,13 +121,13 @@ public class MVPlayerListener implements Listener {
         } else {
             this.plugin.log(Level.FINER, "Player joined AGAIN!");
             if (this.plugin.getMVConfig().getEnforceAccess() // check this only if we're enforcing access!
-                    && !this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + p.getWorld().getName(), false)) {
+                    && !Permissions.ACCESS.hasPermission(p, p.getWorld().getName())) {
                 p.sendMessage("[MV] - Sorry you can't be in this world anymore!");
                 this.sendPlayerToDefaultWorld(p);
             }
         }
         // Handle the Players GameMode setting for the new world.
-        this.handleGameMode(event.getPlayer(), event.getPlayer().getWorld());
+        this.handleGameModeAndFlight(event.getPlayer(), event.getPlayer().getWorld());
         playerWorld.put(p.getName(), p.getWorld().getName());
     }
 
@@ -136,7 +138,7 @@ public class MVPlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR)
     public void playerChangedWorld(PlayerChangedWorldEvent event) {
         // Permissions now determine whether or not to handle a gamemode.
-        this.handleGameMode(event.getPlayer(), event.getPlayer().getWorld());
+        this.handleGameModeAndFlight(event.getPlayer(), event.getPlayer().getWorld());
         playerWorld.put(event.getPlayer().getName(), event.getPlayer().getWorld().getName());
     }
 
@@ -200,8 +202,8 @@ public class MVPlayerListener implements Listener {
             if (event.isCancelled() && teleporter != null) {
                 this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                         + "' was DENIED ACCESS to '" + toWorld.getAlias()
-                        + "' because '" + teleporter.getName()
-                        + "' don't have: multiverse.access." + event.getTo().getWorld().getName());
+                        + "' because '" + teleporter.getName() + "' don't have: "
+                        + Permissions.ACCESS.getName(event.getTo().getWorld().getName()));
                 return;
             }
         } else {
@@ -215,11 +217,9 @@ public class MVPlayerListener implements Listener {
             if (toWorld.getCBWorld().getPlayers().size() >= toWorld.getPlayerLimit()) {
                 // Ouch the world is full, lets see if the player can bypass that limitation
                 if (!pt.playerCanBypassPlayerLimit(toWorld, teleporter, teleportee)) {
-                    this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
-                            + "' was DENIED ACCESS to '" + toWorld.getAlias()
-                            + "' because the world is full and '" + teleporter.getName()
-                            + "' doesn't have: mv.bypass.playerlimit." + event.getTo().getWorld().getName());
-                    event.setCancelled(true);
+                    Logging.fine("Player '%s' was DENIED ACCESS to '%s' because the world is full and '%s' doesn't have: %s.%s",
+                            teleportee.getName(), toWorld.getAlias(), teleporter.getName(),
+                            Permissions.BYPASS_PLAYERLIMIT.getName(), event.getTo().getWorld().getName());
                     return;
                 }
             }
@@ -290,15 +290,20 @@ public class MVPlayerListener implements Listener {
         if (plugin.getMVConfig().getEnforceAccess()) {
             event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, event.getPlayer(), event.getPlayer()));
             if (event.isCancelled()) {
+                //
                 this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                         + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
-                        + "' because they don't have: multiverse.access." + event.getTo().getWorld().getName());
+                        + "' because they don't have: "
+                        + Permissions.ACCESS.getName(event.getTo().getWorld().getName()));
             }
         } else {
             this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                     + "' was allowed to go to '" + event.getTo().getWorld().getName()
                     + "' because enforceaccess is off.");
         }
+        if (!plugin.getMVConfig().isUsingDefaultPortalSearch()) {
+            event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
+        }
     }
 
     private void sendPlayerToDefaultWorld(final Player player) {
@@ -313,13 +318,13 @@ public class MVPlayerListener implements Listener {
     }
 
     // FOLLOWING 2 Methods and Private class handle Per Player GameModes.
-    private void handleGameMode(Player player, World world) {
+    private void handleGameModeAndFlight(Player player, World world) {
 
         MultiverseWorld mvWorld = this.worldManager.getMVWorld(world.getName());
         if (mvWorld != null) {
-            this.handleGameMode(player, mvWorld);
+            this.handleGameModeAndFlight(player, mvWorld);
         } else {
-            this.plugin.log(Level.FINER, "Not handling gamemode for world '" + world.getName()
+            this.plugin.log(Level.FINER, "Not handling gamemode and flight for world '" + world.getName()
                     + "' not managed by Multiverse.");
         }
     }
@@ -329,7 +334,7 @@ public class MVPlayerListener implements Listener {
      * @param player The {@link Player}.
      * @param world The world the player is in.
      */
-    public void handleGameMode(final Player player, final MultiverseWorld world) {
+    public void handleGameModeAndFlight(final Player player, final MultiverseWorld world) {
         // We perform this task one tick later to MAKE SURE that the player actually reaches the
         // destination world, otherwise we'd be changing the player mode if they havent moved anywhere.
         if (!this.pt.playerCanIgnoreGameModeRestriction(world, player)) {
@@ -352,5 +357,18 @@ public class MVPlayerListener implements Listener {
         } else {
             this.plugin.log(Level.FINE, "Player: " + player.getName() + " is IMMUNE to gamemode changes!");
         }
+        // TODO need a override permission for this
+        if (player.getAllowFlight() && !world.getAllowFlight() && player.getGameMode() != GameMode.CREATIVE) {
+            if (!this.pt.playerCanIgnoreAllowFlightRestriction(world, player)) {
+                player.setAllowFlight(false);
+                if (player.isFlying()) {
+                    player.setFlying(false);
+                }
+            }
+        } else if (world.getAllowFlight()) {
+            if (player.getGameMode() == GameMode.CREATIVE) {
+                player.setAllowFlight(true);
+            }
+        }
     }
 }

src/main/java/com/onarandombox/MultiverseCore/utils/AnchorManager.java

@@ -140,7 +140,7 @@ public class AnchorManager {
             if (ancLoc == null) {
                 continue;
             }
-            if (p.hasPermission("multiverse.access." + ancLoc.getWorld().getName())) {
+            if (Permissions.ACCESS.hasPermission(p, ancLoc.getWorld().getName())) {
                 myAnchors.add(anchor);
             }
         }

src/main/java/com/onarandombox/MultiverseCore/utils/BlockSafety.java

@@ -73,28 +73,28 @@ public class BlockSafety {
 
         if (this.isSolidBlock(world.getBlockAt(actual).getType())
                 || this.isSolidBlock(upOne.getBlock().getType())) {
-            Logging.finer("Error Here (Actual)? (%s)[%s]", actual.getBlock().getType(),
+            Logging.finest("Error Here (Actual)? (%s)[%s]", actual.getBlock().getType(),
                     this.isSolidBlock(actual.getBlock().getType()));
-            Logging.finer("Error Here (upOne)? (%s)[%s]", upOne.getBlock().getType(),
+            Logging.finest("Error Here (upOne)? (%s)[%s]", upOne.getBlock().getType(),
                     this.isSolidBlock(upOne.getBlock().getType()));
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            Logging.finer("Error Here (downOne)? (%s)[%s]", downOne.getBlock().getType(),
+            Logging.finest("Error Here (downOne)? (%s)[%s]", downOne.getBlock().getType(),
                     this.isSolidBlock(downOne.getBlock().getType()));
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.FIRE) {
-            Logging.finer("There's fire below! (%s)[%s]", actual.getBlock().getType(),
+            Logging.finest("There's fire below! (%s)[%s]", actual.getBlock().getType(),
                     this.isSolidBlock(actual.getBlock().getType()));
             return false;
         }
 
         if (isBlockAboveAir(actual)) {
-            Logging.finer("Is block above air [%s]", isBlockAboveAir(actual));
-            Logging.finer("Has 2 blocks of water below [%s]", this.hasTwoBlocksofWaterBelow(actual));
+            Logging.finest("Is block above air [%s]", isBlockAboveAir(actual));
+            Logging.finest("Has 2 blocks of water below [%s]", this.hasTwoBlocksofWaterBelow(actual));
             return this.hasTwoBlocksofWaterBelow(actual);
         }
         return true;

src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java

@@ -36,17 +36,6 @@ public class MVPermissions implements PermissionsInterface {
 
     }
 
-    /**
-     * Check if a Player can ignore GameMode restrictions for world they travel to.
-     *
-     * @param p The {@link Player} to check.
-     * @param w The {@link MultiverseWorld} the player wants to teleport to.
-     * @return True if they should bypass restrictions.
-     */
-    public boolean canIgnoreGameModeRestriction(Player p, MultiverseWorld w) {
-        return p.hasPermission("mv.bypass.gamemode." + w.getName());
-    }
-
     /**
      * Check if a Player can teleport to the Destination world from there current world.
      *
@@ -103,7 +92,7 @@ public class MVPermissions implements PermissionsInterface {
             this.plugin.log(Level.FINEST, "EnforceAccess is OFF. Player was allowed in " + w.getAlias());
             return true;
         }
-        return this.hasPermission(p, "multiverse.access." + w.getName(), false);
+        return Permissions.ACCESS.hasPermission(p, w.getName());
     }
 
     private boolean canEnterLocation(Player p, Location l) {
@@ -114,7 +103,7 @@ public class MVPermissions implements PermissionsInterface {
         if (!this.plugin.getMVWorldManager().isMVWorld(worldName)) {
             return false;
         }
-        return this.hasPermission(p, "multiverse.access." + worldName, false);
+        return Permissions.ACCESS.hasPermission(p, worldName);
     }
 
     /**
@@ -141,7 +130,7 @@ public class MVPermissions implements PermissionsInterface {
         if (!canEnterLocation(p, d.getLocation(p))) {
             return false;
         }
-        return this.hasPermission(p, d.getRequiredPermission(), false);
+        return d.hasRequiredPermission(p);
     }
 
     /**
@@ -177,14 +166,14 @@ public class MVPermissions implements PermissionsInterface {
                     ChatColor.DARK_AQUA, ChatColor.WHITE));
             cango = false;
         }
-        if (!this.hasPermission(p, "multiverse.access." + worldName, false)) {
+        if (!Permissions.ACCESS.hasPermission(p, worldName)) {
             asker.sendMessage(String.format("The player (%s%s%s) does not have the required world entry permission (%s%s%s) to go to the destination (%s%s%s).",
                     ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
-                    ChatColor.GREEN, "multiverse.access." + worldName, ChatColor.WHITE,
+                    ChatColor.GREEN, Permissions.ACCESS.getName(worldName), ChatColor.WHITE,
                     ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE));
             cango = false;
         }
-        if (!this.hasPermission(p, d.getRequiredPermission(), false)) {
+        if (d.hasRequiredPermission(p)) {
             asker.sendMessage(String.format("The player (%s%s%s) does not have the required entry permission (%s%s%s) to go to the destination (%s%s%s).",
                     ChatColor.AQUA, p.getDisplayName(), ChatColor.WHITE,
                     ChatColor.GREEN, d.getRequiredPermission(), ChatColor.WHITE,

src/main/java/com/onarandombox/MultiverseCore/utils/PermissionTools.java

@@ -140,7 +140,7 @@ public class PermissionTools {
                 return true;
             }
             // If the player does not have to pay, return now.
-            if (this.plugin.getMVPerms().hasPermission(teleporter, toWorld.getExemptPermission().getName(), true)) {
+            if (Permissions.COST_EXEMPT.hasPermission(teleporter, toWorld.getName())) {
                 return true;
             }
             final boolean usingVault;
@@ -275,8 +275,7 @@ public class PermissionTools {
             return true;
         }
 
-        MVPermissions perms = plugin.getMVPerms();
-        if (perms.hasPermission(teleportee, "mv.bypass.playerlimit." + toWorld.getName(), false)) {
+        if (Permissions.BYPASS_PLAYERLIMIT.hasPermission(teleportee, toWorld.getName())) {
             return true;
         } else {
             teleporter.sendMessage("The world " + toWorld.getColoredWorldString() + " is full");
@@ -293,7 +292,24 @@ public class PermissionTools {
      */
     public boolean playerCanIgnoreGameModeRestriction(MultiverseWorld toWorld, Player teleportee) {
         if (toWorld != null) {
-            return this.plugin.getMVPerms().canIgnoreGameModeRestriction(teleportee, toWorld);
+            return Permissions.BYPASS_GAMEMODE.hasPermission(teleportee, toWorld.getName());
+        } else {
+            // TODO: Determine if this value is false because a world didn't exist
+            // or if it was because a world wasn't imported.
+            return true;
+        }
+    }
+
+    /**
+     * Checks to see if a player should bypass allow flight restrictions.
+     *
+     * @param toWorld world travelling to.
+     * @param teleportee player travelling.
+     * @return True if they should bypass restrictions
+     */
+    public boolean playerCanIgnoreAllowFlightRestriction(MultiverseWorld toWorld, Player teleportee) {
+        if (toWorld != null) {
+            return Permissions.BYPASS_ALLOWFLY.hasPermission(teleportee, toWorld.getName());
         } else {
             // TODO: Determine if this value is false because a world didn't exist
             // or if it was because a world wasn't imported.

src/main/java/com/onarandombox/MultiverseCore/utils/Permissions.java

@@ -0,0 +1,182 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import com.dumptruckman.minecraft.pluginbase.permission.BukkitPerm;
+import com.dumptruckman.minecraft.pluginbase.permission.BukkitPermFactory;
+import com.dumptruckman.minecraft.pluginbase.permission.PermDefault;
+import com.onarandombox.MultiverseCore.api.Core;
+
+public class Permissions {
+
+    // ============ Multiverse Bypass Permissions ============
+
+    private static final BukkitPerm MV = BukkitPermFactory.newBukkitPerm(Core.class, "mv.*")
+            .def(PermDefault.FALSE).build();
+
+    private static final BukkitPerm BYPASS_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "mv.bypass.*")
+            .def(PermDefault.FALSE).parent(MV).build();
+
+    private static final BukkitPerm BYPASS_GAMEMODE_ALL = BukkitPermFactory.newBukkitPerm(Core.class,
+            "mv.bypass.gamemode.*").desc("Allows a player to ignore gamemode changes for all worlds.")
+            .def(PermDefault.FALSE).parent(BYPASS_ALL).build();
+
+    private static final BukkitPerm BYPASS_PLAYERLIMIT_ALL = BukkitPermFactory.newBukkitPerm(Core.class,
+            "mv.bypass.playerlimit.*").desc("Allows a player to ignore the player limit for all worlds.")
+            .def(PermDefault.FALSE).parent(BYPASS_ALL).build();
+
+    private static final BukkitPerm BYPASS_ALLOWFLY_ALL = BukkitPermFactory.newBukkitPerm(Core.class,
+            "mv.bypass.allowfly.*").desc("Allows a player to ignore the flight restrictions for all worlds.")
+            .def(PermDefault.FALSE).parent(BYPASS_ALL).build();
+
+    /** Used for bypassing the gamemode of specific worlds. */
+    public static final BukkitPerm BYPASS_GAMEMODE = BukkitPermFactory.newBukkitPerm(Core.class,
+            "mv.bypass.gamemode").desc("Allows a player to ignore gamemode changes for a specific world.")
+            .specificOnly().def(PermDefault.FALSE).parent(BYPASS_GAMEMODE_ALL).build();
+
+    /** Used for bypassing the player limit of specific worlds. */
+    public static final BukkitPerm BYPASS_PLAYERLIMIT = BukkitPermFactory.newBukkitPerm(Core.class,
+            "mv.bypass.playerlimit").desc("Allows a player to ignore the player limit for a specific world.")
+            .specificOnly().def(PermDefault.FALSE).parent(BYPASS_PLAYERLIMIT_ALL).build();
+
+    /** Used for bypassing the allow fly setting of specific worlds. */
+    public static final BukkitPerm BYPASS_ALLOWFLY = BukkitPermFactory.newBukkitPerm(Core.class,
+            "mv.bypass.allowfly").desc("Allows a player to ignore the flight restrictions for a specific world.")
+            .specificOnly().def(PermDefault.FALSE).parent(BYPASS_ALLOWFLY_ALL).build();
+
+
+    // ============ Multiverse World Permissions ============
+
+    private static final BukkitPerm ACCESS_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "access.*")
+            .desc("Allows a player to access all worlds.")
+            .usePluginName().addToAll().build();
+
+    private static final BukkitPerm COST_EXEMPT_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "exempt.*")
+            .desc("Allows a player to bypass the costs for worlds and MV portals.")
+            .usePluginName().addToAll().build();
+
+    public static final BukkitPerm ACCESS = BukkitPermFactory.newBukkitPerm(Core.class, "access")
+            .desc("Allows a player to access a specific world.")
+            .usePluginName().specificOnly().parent(ACCESS_ALL).build();
+
+    public static final BukkitPerm COST_EXEMPT = BukkitPermFactory.newBukkitPerm(Core.class, "exempt")
+            .desc("Allows a player to bypass the costs for a specific world and MV portals in that world.")
+            .usePluginName().specificOnly().parent(COST_EXEMPT_ALL).build();
+
+
+    // ============ Multiverse Teleport Permissions ============
+
+    private static final BukkitPerm TELEPORT_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.*")
+            .desc("Allows the player to use all forms of teleportation.")
+            .usePluginName().addToAll().build();
+
+    private static final BukkitPerm TELEPORT_SELF_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.*")
+            .desc("Allows the player to use all forms of self teleportation.")
+            .usePluginName().parent(TELEPORT_ALL).build();
+
+    private static final BukkitPerm TELEPORT_OTHER_ALL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.*")
+            .desc("Allows the player to use all forms of teleportation on other players.")
+            .usePluginName().parent(TELEPORT_ALL).build();
+
+    private static final BukkitPerm TELEPORT_SELF_WORLD = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.w")
+            .desc("Allows the player to teleport self to any world.")
+            .usePluginName().parent(TELEPORT_SELF_ALL).build();
+
+    public static final BukkitPerm TP_SELF_WORLD = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.w")
+            .desc("Allows the player to teleport self to a specific world.")
+            .usePluginName().specificOnly().parent(TELEPORT_SELF_WORLD).build();
+
+    private static final BukkitPerm TELEPORT_SELF_ANCHOR = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.a")
+            .desc("Allows the player to teleport self to any anchor.")
+            .usePluginName().parent(TELEPORT_SELF_ALL).build();
+
+    public static final BukkitPerm TP_SELF_ANCHOR = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.a")
+            .desc("Allows the player to teleport self to a specific anchor.")
+            .usePluginName().specificOnly().parent(TELEPORT_SELF_ANCHOR).build();
+
+    public static final BukkitPerm TP_SELF_EXACT = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.e")
+            .desc("Allows the player to teleport self to an exact location.")
+            .usePluginName().parent(TELEPORT_SELF_ALL).build();
+
+    private static final BukkitPerm TELEPORT_SELF_PLAYER = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.pl")
+            .desc("Allows the player to teleport self to any player.")
+            .usePluginName().parent(TELEPORT_SELF_ALL).build();
+
+    public static final BukkitPerm TP_SELF_PLAYER = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.pl")
+            .desc("Allows the player to teleport self to a specific player.")
+            .usePluginName().specificOnly().parent(TELEPORT_SELF_PLAYER).build();
+
+    public static final BukkitPerm TP_SELF_CANNON = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.ca")
+            .desc("Allows the player to teleport self to cannon.")
+            .usePluginName().parent(TELEPORT_SELF_ALL).build();
+
+    public static final BukkitPerm TP_SELF_BED = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.b")
+            .desc("Allows the player to teleport self to their bed.")
+            .usePluginName().parent(TELEPORT_SELF_ALL).build();
+
+    private static final BukkitPerm TELEPORT_SELF_PORTAL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.p")
+            .desc("Allows the player to teleport self to any MV portal.")
+            .usePluginName().parent(TELEPORT_SELF_ALL).build();
+
+    public static final BukkitPerm TP_SELF_PORTAL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.p")
+            .desc("Allows the player to teleport self to a specific MV portal.")
+            .usePluginName().specificOnly().parent(TELEPORT_SELF_PORTAL).build();
+
+    private static final BukkitPerm TELEPORT_SELF_OPENWARP = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.ow")
+            .desc("Allows the player to teleport self to any OpenWarp destination.")
+            .usePluginName().parent(TELEPORT_SELF_ALL).build();
+
+    public static final BukkitPerm TP_SELF_OPENWARP = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.self.ow")
+            .desc("Allows the player to teleport self to a specific OpenWarp destination.")
+            .usePluginName().specificOnly().parent(TELEPORT_SELF_OPENWARP).build();
+
+    private static final BukkitPerm TELEPORT_OTHER_WORLD = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.w")
+            .desc("Allows the player to teleport other to any world.")
+            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
+
+    public static final BukkitPerm TP_OTHER_WORLD = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.w")
+            .desc("Allows the player to teleport other to a specific world.")
+            .usePluginName().specificOnly().parent(TELEPORT_OTHER_WORLD).build();
+
+    private static final BukkitPerm TELEPORT_OTHER_ANCHOR = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.a")
+            .desc("Allows the player to teleport other to any anchor.")
+            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
+
+    public static final BukkitPerm TP_OTHER_ANCHOR = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.a")
+            .desc("Allows the player to teleport other to a specific anchor.")
+            .usePluginName().specificOnly().parent(TELEPORT_OTHER_ANCHOR).build();
+
+    public static final BukkitPerm TP_OTHER_EXACT = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.e")
+            .desc("Allows the player to teleport other to an exact location.")
+            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
+
+    private static final BukkitPerm TELEPORT_OTHER_PLAYER = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.pl")
+            .desc("Allows the player to teleport other to any player.")
+            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
+
+    public static final BukkitPerm TP_OTHER_PLAYER = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.pl")
+            .desc("Allows the player to teleport other to a specific player.")
+            .usePluginName().specificOnly().parent(TELEPORT_OTHER_PLAYER).build();
+
+    public static final BukkitPerm TP_OTHER_CANNON = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.ca")
+            .desc("Allows the player to teleport other to cannon.")
+            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
+
+    public static final BukkitPerm TP_OTHER_BED = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.b")
+            .desc("Allows the player to teleport other to their bed.")
+            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
+
+    private static final BukkitPerm TELEPORT_OTHER_PORTAL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.p")
+            .desc("Allows the player to teleport other to any MV portal.")
+            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
+
+    public static final BukkitPerm TP_OTHER_PORTAL = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.p")
+            .desc("Allows the player to teleport other to a specific MV portal.")
+            .usePluginName().specificOnly().parent(TELEPORT_OTHER_PORTAL).build();
+
+    private static final BukkitPerm TELEPORT_OTHER_OPENWARP = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.ow")
+            .desc("Allows the player to teleport other to any OpenWarp destination.")
+            .usePluginName().parent(TELEPORT_OTHER_ALL).build();
+
+    public static final BukkitPerm TP_OTHER_OPENWARP = BukkitPermFactory.newBukkitPerm(Core.class, "teleport.other.ow")
+            .desc("Allows the player to teleport other to a specific OpenWarp destination.")
+            .usePluginName().specificOnly().parent(TELEPORT_OTHER_OPENWARP).build();
+}

src/main/java/com/onarandombox/MultiverseCore/utils/SimpleWorldPurger.java

@@ -7,10 +7,10 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
-
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Animals;
@@ -18,13 +18,15 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Golem;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Monster;
+import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
 import org.bukkit.entity.Squid;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
-import java.util.logging.Level;
 
 /**
  * Utility class that removes animals from worlds that don't belong there.
@@ -86,18 +88,41 @@ public class SimpleWorldPurger implements WorldPurger {
         if (world == null) {
             return;
         }
+        int projectilesKilled = 0;
         int entitiesKilled = 0;
         boolean specifiedAll = thingsToKill.contains("ALL");
         boolean specifiedAnimals = thingsToKill.contains("ANIMALS") || specifiedAll;
         boolean specifiedMonsters = thingsToKill.contains("MONSTERS") || specifiedAll;
-        for (Entity e : world.getEntities()) {
+        List<Entity> worldEntities = world.getEntities();
+        List<LivingEntity> livingEntities = new ArrayList<LivingEntity>(worldEntities.size());
+        List<Projectile> projectiles = new ArrayList<Projectile>(worldEntities.size());
+        for (final Entity e : worldEntities) {
+            if (e instanceof Projectile) {
+                final Projectile p = (Projectile) e;
+                if (p.getShooter() != null) {
+                    projectiles.add((Projectile) e);
+                }
+            } else if (e instanceof LivingEntity) {
+                livingEntities.add((LivingEntity) e);
+            }
+        }
+        for (final LivingEntity e : livingEntities) {
             if (killDecision(e, thingsToKill, negateAnimals, negateMonsters, specifiedAnimals, specifiedMonsters)) {
+                final Iterator<Projectile> it = projectiles.iterator();
+                while (it.hasNext()) {
+                    final Projectile p = it.next();
+                    if (p.getShooter().equals(e)) {
+                        p.remove();
+                        it.remove();
+                        projectilesKilled++;
+                    }
+                }
                 e.remove();
                 entitiesKilled++;
             }
         }
         if (sender != null) {
-            sender.sendMessage(entitiesKilled + " entities purged from the world '" + world.getName() + "'");
+            sender.sendMessage(entitiesKilled + " entities purged from the world '" + world.getName() + "' along with " + projectilesKilled + " projectiles that belonged to them.");
         }
     }
 
@@ -108,7 +133,7 @@ public class SimpleWorldPurger implements WorldPurger {
         if (e instanceof Golem || e instanceof Squid || e instanceof Animals) {
             // it's an animal
             if (specifiedAnimals && !negateAnimals) {
-                this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all animals: " + e);
+                Logging.finest("Removing an entity because I was told to remove all animals in world %s: %s", e.getWorld().getName(), e);
                 return true;
             }
             if (specifiedAnimals)
@@ -117,7 +142,7 @@ public class SimpleWorldPurger implements WorldPurger {
         } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime) {
             // it's a monster
             if (specifiedMonsters && !negateMonsters) {
-                this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all monsters: " + e);
+                Logging.finest("Removing an entity because I was told to remove all monsters in world %s: %s", e.getWorld().getName(), e);
                 return true;
             }
             if (specifiedMonsters)
@@ -129,14 +154,14 @@ public class SimpleWorldPurger implements WorldPurger {
             if (type != null && type.equals(e.getType())) {
                 specified = true;
                 if (!negate) {
-                    this.plugin.log(Level.FINEST, "Removing an entity because it WAS specified and we are NOT negating: " + e);
+                    Logging.finest("Removing an entity because it WAS specified and we are NOT negating in world %s: %s", e.getWorld().getName(), e);
                     return true;
                 }
                 break;
             }
         }
         if (!specified && negate) {
-            this.plugin.log(Level.FINEST, "Removing an entity because it was NOT specified and we ARE negating: " + e);
+            Logging.finest("Removing an entity because it was NOT specified and we ARE negating in world %s: %s", e.getWorld().getName(), e);
             return true;
         }
 

src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java

@@ -10,6 +10,7 @@ package com.onarandombox.MultiverseCore.utils;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MVWorld;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.WorldProperties;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
@@ -26,8 +27,6 @@ import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.generator.ChunkGenerator;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.Plugin;
 
 import java.io.File;
@@ -52,14 +51,14 @@ public class WorldManager implements MVWorldManager {
     private final MultiverseCore plugin;
     private final WorldPurger worldPurger;
     private final Map<String, MultiverseWorld> worlds;
-    private Map<String, MVWorld> worldsFromTheConfig;
+    private Map<String, WorldProperties> worldsFromTheConfig;
     private FileConfiguration configWorlds = null;
     private Map<String, String> defaultGens;
     private String firstSpawn;
 
     public WorldManager(MultiverseCore core) {
         this.plugin = core;
-        this.worldsFromTheConfig = new HashMap<String, MVWorld>();
+        this.worldsFromTheConfig = new HashMap<String, WorldProperties>();
         this.worlds = new ConcurrentHashMap<String, MultiverseWorld>();
         this.worldPurger = new SimpleWorldPurger(plugin);
     }
@@ -207,8 +206,10 @@ public class WorldManager implements MVWorldManager {
         }
 
         // Important: doLoad() needs the MVWorld-object in worldsFromTheConfig
-        if (!worldsFromTheConfig.containsKey(name))
-            worldsFromTheConfig.put(name, new MVWorld(useSpawnAdjust));
+        if (!worldsFromTheConfig.containsKey(name)) {
+            WorldProperties props = new WorldProperties(useSpawnAdjust, env);
+            worldsFromTheConfig.put(name, props);
+        }
 
         StringBuilder builder = new StringBuilder();
         builder.append("Loading World & Settings - '").append(name).append("'");
@@ -308,12 +309,10 @@ public class WorldManager implements MVWorldManager {
     @Override
     public boolean unloadWorld(String name) {
         if (this.worlds.containsKey(name)) {
+            this.worldsFromTheConfig.get(name).cacheVirtualProperties();
             if (this.unloadWorldFromBukkit(name, true)) {
                 this.worlds.remove(name);
                 Logging.info("World '%s' was unloaded from memory.", name);
-
-                this.worldsFromTheConfig.get(name).tearDown();
-
                 return true;
             } else {
                 Logging.warning("World '%s' could not be unloaded. Is it a default world?", name);
@@ -355,17 +354,20 @@ public class WorldManager implements MVWorldManager {
     }
 
     private boolean doLoad(String name) {
-        return doLoad(name, false);
+        return doLoad(name, false, null);
     }
 
-    private boolean doLoad(String name, boolean ignoreExists) {
+    private boolean doLoad(String name, boolean ignoreExists, WorldType type) {
         if (!worldsFromTheConfig.containsKey(name))
             throw new IllegalArgumentException("That world doesn't exist!");
 
-        MVWorld world = worldsFromTheConfig.get(name);
+        WorldProperties world = worldsFromTheConfig.get(name);
         WorldCreator creator = WorldCreator.name(name);
 
         creator.environment(world.getEnvironment()).seed(world.getSeed());
+        if (type != null) {
+            creator.type(type);
+        }
         if ((world.getGenerator() != null) && (!world.getGenerator().equals("null")))
             creator.generator(world.getGenerator());
 
@@ -385,7 +387,7 @@ public class WorldManager implements MVWorldManager {
             return false;
         }
 
-        MVWorld mvworld = worldsFromTheConfig.get(worldName);
+        WorldProperties mvworld = worldsFromTheConfig.get(worldName);
         World cbworld;
         try {
             cbworld = creator.createWorld();
@@ -394,9 +396,9 @@ public class WorldManager implements MVWorldManager {
             brokenWorld(worldName);
             return false;
         }
-        mvworld.init(cbworld, plugin);
-        this.worldPurger.purgeWorld(mvworld);
-        this.worlds.put(worldName, mvworld);
+        MVWorld world = new MVWorld(plugin, cbworld, mvworld);
+        this.worldPurger.purgeWorld(world);
+        this.worlds.put(worldName, world);
         return true;
     }
 
@@ -610,33 +612,13 @@ public class WorldManager implements MVWorldManager {
         // Basic Counter to count how many Worlds we are loading.
         int count = 0;
         this.ensureConfigIsPrepared();
-        this.ensureSecondNamespaceIsPrepared();
 
         // Force the worlds to be loaded, ie don't just load new worlds.
         if (forceLoad) {
-            // Remove all world permissions.
-            Permission allAccess = this.plugin.getServer().getPluginManager().getPermission("multiverse.access.*");
-            Permission allExempt = this.plugin.getServer().getPluginManager().getPermission("multiverse.exempt.*");
-            for (MultiverseWorld w : this.worlds.values()) {
-                // Remove this world from the master list
-                if (allAccess != null) {
-                    allAccess.getChildren().remove(w.getAccessPermission().getName());
-                }
-                if (allExempt != null) {
-                    allExempt.getChildren().remove(w.getAccessPermission().getName());
-                }
-                this.plugin.getServer().getPluginManager().removePermission(w.getAccessPermission().getName());
-                this.plugin.getServer().getPluginManager().removePermission(w.getExemptPermission().getName());
-                // Special namespace for gamemodes
-                this.plugin.getServer().getPluginManager().removePermission("mv.bypass.gamemode." + w.getName());
-            }
-            // Recalc the all permission
-            this.plugin.getServer().getPluginManager().recalculatePermissionDefaults(allAccess);
-            this.plugin.getServer().getPluginManager().recalculatePermissionDefaults(allExempt);
             this.worlds.clear();
         }
 
-        for (Map.Entry<String, MVWorld> entry : worldsFromTheConfig.entrySet()) {
+        for (Map.Entry<String, WorldProperties> entry : worldsFromTheConfig.entrySet()) {
             if (worlds.containsKey(entry.getKey())) {
                 continue;
             }
@@ -652,14 +634,6 @@ public class WorldManager implements MVWorldManager {
         this.saveWorldsConfig();
     }
 
-    private void ensureSecondNamespaceIsPrepared() {
-        Permission special = this.plugin.getServer().getPluginManager().getPermission("mv.bypass.gamemode.*");
-        if (special == null) {
-            special = new Permission("mv.bypass.gamemode.*", PermissionDefault.FALSE);
-            this.plugin.getServer().getPluginManager().addPermission(special);
-        }
-    }
-
     /**
      * {@inheritDoc}
      * @deprecated This is deprecated!
@@ -696,31 +670,23 @@ public class WorldManager implements MVWorldManager {
         // load world-objects
         Stack<String> worldKeys = new Stack<String>();
         worldKeys.addAll(this.configWorlds.getConfigurationSection("worlds").getKeys(false));
-        Map<String, MVWorld> newWorldsFromTheConfig = new HashMap<String, MVWorld>();
+        Map<String, WorldProperties> newWorldsFromTheConfig = new HashMap<String, WorldProperties>();
         while (!worldKeys.isEmpty()) {
             String key = worldKeys.pop();
             String path = "worlds" + SEPARATOR + key;
             Object obj = this.configWorlds.get(path);
-            if ((obj != null) && (obj instanceof MVWorld)) {
+            if ((obj != null) && (obj instanceof WorldProperties)) {
                 String worldName = key.replaceAll(String.valueOf(SEPARATOR), ".");
-                MVWorld mvWorld = null;
+                WorldProperties props = (WorldProperties) obj;
                 if (this.worldsFromTheConfig.containsKey(worldName)) {
                     // Object-Recycling :D
                     // TODO Why is is checking worldsFromTheConfig and then getting from worlds?  So confused... (DTM)
-                    mvWorld = (MVWorld) this.worlds.get(worldName);
+                    MVWorld mvWorld = (MVWorld) this.worlds.get(worldName);
                     if (mvWorld != null) {
-                        mvWorld.copyValues((MVWorld) obj);
+                        mvWorld.copyValues((WorldProperties) obj);
                     }
                 }
-                if (mvWorld == null) {
-                    // we have to use a new one
-                    World cbworld = this.plugin.getServer().getWorld(worldName);
-                    mvWorld = (MVWorld) obj;
-                    if (cbworld != null) {
-                        mvWorld.init(cbworld, this.plugin);
-                    }
-                }
-                newWorldsFromTheConfig.put(worldName, mvWorld);
+                newWorldsFromTheConfig.put(worldName, props);
             } else if (this.configWorlds.isConfigurationSection(path)) {
                 ConfigurationSection section = this.configWorlds.getConfigurationSection(path);
                 Set<String> subkeys = section.getKeys(false);
@@ -742,7 +708,7 @@ public class WorldManager implements MVWorldManager {
         try {
             this.configWorlds.options().pathSeparator(SEPARATOR);
             this.configWorlds.set("worlds", null);
-            for (Map.Entry<String, ? extends MultiverseWorld> entry : worldsFromTheConfig.entrySet()) {
+            for (Map.Entry<String, WorldProperties> entry : worldsFromTheConfig.entrySet()) {
                 this.configWorlds.set("worlds" + SEPARATOR + entry.getKey(), entry.getValue());
             }
             this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
@@ -797,9 +763,10 @@ public class WorldManager implements MVWorldManager {
 
             world.setSeed(theSeed);
         }
+        WorldType type = world.getWorldType();
 
         if (this.deleteWorld(name, false, false)) {
-            this.doLoad(name, true);
+            this.doLoad(name, true, type);
             SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
             Location newSpawn = world.getSpawnLocation();
             // Send all players that were in the old world, BACK to it!

src/main/resources/plugin.yml

@@ -215,3 +215,20 @@ commands:
     description: Reduces startup messages
     usage: |
             /<command> [true|false]
+  
+  mvgamerule:
+    description: Sets a gamerule.
+    usage: |
+            /<command> {RULE} {VALUE} [WORLD]
+  mvrule:
+    description: Sets a gamerule.
+    usage: |
+            /<command> {RULE} {VALUE} [WORLD]
+  mvgamerules:
+    description: Lists the gamerules.
+    usage: |
+            /<command> [WORLD]
+  mvrules:
+    description: Lists the gamerules.
+    usage: |
+            /<command> [WORLD]

src/test/java/com/onarandombox/MultiverseCore/TestDebugMode.java

@@ -5,17 +5,11 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package com.onarandombox.MultiverseCore.test;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.File;
+package com.onarandombox.MultiverseCore;
 
+import com.onarandombox.MultiverseCore.api.Core;
+import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import junit.framework.Assert;
-
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -28,9 +22,12 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.Core;
-import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
+import java.io.File;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class })

src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java

@@ -1,13 +1,9 @@
-package com.onarandombox.MultiverseCore.test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+package com.onarandombox.MultiverseCore;
 
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
+import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -24,11 +20,13 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
-import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class })

src/test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java

@@ -1,8 +1,7 @@
-package com.onarandombox.MultiverseCore.test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+package com.onarandombox.MultiverseCore;
 
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.Server;
 import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
@@ -15,9 +14,9 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 
 @RunWith(PowerMockRunner.class)

src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java

@@ -5,15 +5,13 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package com.onarandombox.MultiverseCore.test;
+package com.onarandombox.MultiverseCore;
 
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
 import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
-import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
+import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -300,7 +298,7 @@ public class TestWorldProperties {
         assertTrue(core.saveMVConfigs());
         // change a value here
         FileConfiguration config = YamlConfiguration.loadConfiguration(new File(core.getDataFolder(), "worlds.yml"));
-        MVWorld worldObj = (MVWorld) config.get("worlds.world");
+        WorldProperties worldObj = (WorldProperties) config.get("worlds.world");
         assertTrue(worldObj.setColor("GREEN"));
         config.set("worlds.world", worldObj);
         config.save(new File(core.getDataFolder(), "worlds.yml"));

src/test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java

@@ -1,10 +1,8 @@
-package com.onarandombox.MultiverseCore.test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-import java.util.Arrays;
+package com.onarandombox.MultiverseCore;
 
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.api.WorldPurger;
+import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -18,10 +16,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.api.WorldPurger;
-import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ MultiverseCore.class, PluginDescriptionFile.class })
@@ -113,10 +111,13 @@ public class TestWorldPurger {
     }
 
     private void createAnimals() {
+        World world = mvWorld.getCBWorld();
         sheep = mock(Sheep.class);
         when(sheep.getType()).thenReturn(EntityType.SHEEP);
+        when(sheep.getWorld()).thenReturn(world);
         zombie = mock(Zombie.class);
         when(zombie.getType()).thenReturn(EntityType.ZOMBIE);
+        when(zombie.getWorld()).thenReturn(world);
         when(cbworld.getEntities()).thenReturn(Arrays.asList((Entity) sheep, (Entity) zombie));
     }
 }

src/test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java

@@ -5,15 +5,18 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package com.onarandombox.MultiverseCore.test;
+package com.onarandombox.MultiverseCore;
 
-import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import com.onarandombox.MultiverseCore.test.utils.TestInstanceCreator;
-import com.onarandombox.MultiverseCore.test.utils.WorldCreatorMatcher;
+import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
+import com.onarandombox.MultiverseCore.utils.WorldCreatorMatcher;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
+import org.bukkit.Server;
+import org.bukkit.WorldCreator;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;

src/test/java/com/onarandombox/MultiverseCore/utils/MVTestLogFormatter.java

@@ -5,7 +5,7 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package com.onarandombox.MultiverseCore.test.utils;
+package com.onarandombox.MultiverseCore.utils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java

@@ -5,16 +5,7 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package com.onarandombox.MultiverseCore.test.utils;
-
-import static org.mockito.Mockito.*;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
+package com.onarandombox.MultiverseCore.utils;
 
 import org.bukkit.Difficulty;
 import org.bukkit.Location;
@@ -26,9 +17,20 @@ import org.bukkit.generator.ChunkGenerator;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.WeakHashMap;
+
+import static org.mockito.Mockito.*;
+
 public class MockWorldFactory {
 
     private static final Map<String, World> createdWorlds = new HashMap<String, World>();
+    private static final Map<UUID, World> worldUIDS = new HashMap<UUID, World>();
 
     private static final Map<World, Boolean> pvpStates = new WeakHashMap<World, Boolean>();
     private static final Map<World, Boolean> keepSpawnInMemoryStates = new WeakHashMap<World, Boolean>();
@@ -39,6 +41,7 @@ public class MockWorldFactory {
 
     private static void registerWorld(World world) {
         createdWorlds.put(world.getName(), world);
+        worldUIDS.put(world.getUID(), world);
         new File(TestInstanceCreator.worldsDirectory, world.getName()).mkdir();
     }
 
@@ -132,6 +135,7 @@ public class MockWorldFactory {
                 return mockBlock;
             }
         });
+        when(mockWorld.getUID()).thenReturn(UUID.randomUUID());
         return mockWorld;
     }
 
@@ -203,6 +207,10 @@ public class MockWorldFactory {
         return createdWorlds.get(name);
     }
 
+    public static World getWorld(UUID worldUID) {
+        return worldUIDS.get(worldUID);
+    }
+
     public static List<World> getWorlds() {
         // we have to invert the order!
         ArrayList<World> myList = new ArrayList<World>(createdWorlds.values());
@@ -217,5 +225,6 @@ public class MockWorldFactory {
         for (String name : createdWorlds.keySet())
             new File(TestInstanceCreator.worldsDirectory, name).delete();
         createdWorlds.clear();
+        worldUIDS.clear();
     }
 }

src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java

@@ -5,7 +5,7 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package com.onarandombox.MultiverseCore.test.utils;
+package com.onarandombox.MultiverseCore.utils;
 
 import buscript.Buscript;
 import com.onarandombox.MultiverseCore.MultiverseCore;
@@ -13,8 +13,6 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
 import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
-import com.onarandombox.MultiverseCore.utils.FileUtils;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
 import junit.framework.Assert;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -38,6 +36,7 @@ import java.io.File;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -122,6 +121,19 @@ public class TestInstanceCreator {
                 }
             });
 
+            when(mockServer.getWorld(any(UUID.class))).thenAnswer(new Answer<World>() {
+                @Override
+                public World answer(InvocationOnMock invocation) throws Throwable {
+                    UUID arg;
+                    try {
+                        arg = (UUID) invocation.getArguments()[0];
+                    } catch (Exception e) {
+                        return null;
+                    }
+                    return MockWorldFactory.getWorld(arg);
+                }
+            });
+
             when(mockServer.getWorlds()).thenAnswer(new Answer<List<World>>() {
                 @Override
                 public List<World> answer(InvocationOnMock invocation) throws Throwable {

src/test/java/com/onarandombox/MultiverseCore/utils/Util.java

@@ -5,7 +5,7 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package com.onarandombox.MultiverseCore.test.utils;
+package com.onarandombox.MultiverseCore.utils;
 
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Handler;

src/test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java

@@ -5,7 +5,7 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package com.onarandombox.MultiverseCore.test.utils;
+package com.onarandombox.MultiverseCore.utils;
 
 import org.bukkit.WorldCreator;
 import org.mockito.ArgumentMatcher;