Merge branch 'develop' into async-paste2

This commit is contained in:
tastybento 2018-12-30 16:48:54 -08:00
commit cf0fdf45b9

View File

@ -155,7 +155,11 @@ public class IslandWorldManager {
* @return world settings, or null if world is unknown * @return world settings, or null if world is unknown
*/ */
public WorldSettings getWorldSettings(World world) { public WorldSettings getWorldSettings(World world) {
return gameModes.get(Util.getWorld(world)).getWorldSettings(); if (gameModes.containsKey(Util.getWorld(world))) {
return gameModes.get(Util.getWorld(world)).getWorldSettings();
} else {
return null;
}
} }
/** /**