Many small fixes.

- Update to 1.1-R2
 - Fix the '--list' not working with the import
 - Fix typo in new portalform catcher
 - Fix 'the_end' not working on import/create
This commit is contained in:
Eric Stokes 2012-01-29 12:11:41 -07:00
parent 74726b44ab
commit 6c9bc6951f
4 changed files with 4 additions and 3 deletions

View File

@ -166,7 +166,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.1-R1</version> <version>1.1-R2</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

View File

@ -1167,7 +1167,7 @@ public class MVWorld implements MultiverseWorld {
*/ */
@Override @Override
public void allowPortalMaking(AllowedPortalType type) { public void allowPortalMaking(AllowedPortalType type) {
this.setKnownProperty("bedrespawn", type.toString(), null); this.setKnownProperty("portalform", type.toString(), null);
} }
/** /**

View File

@ -91,6 +91,7 @@ public class EnvironmentCommand extends MultiverseCommand {
* @return The environment as {@link org.bukkit.World.Environment} * @return The environment as {@link org.bukkit.World.Environment}
*/ */
public static World.Environment getEnvFromString(String env) { public static World.Environment getEnvFromString(String env) {
env = env.toUpperCase();
// Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER")) if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
env = "NETHER"; env = "NETHER";

View File

@ -34,7 +34,7 @@ public class ImportCommand extends MultiverseCommand {
super(plugin); super(plugin);
this.setName("Import World"); this.setName("Import World");
this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV} " + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n] -t [TYPE]"); this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV} " + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n] -t [TYPE]");
this.setArgRange(2, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck this.setArgRange(1, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
this.addKey("mvimport"); this.addKey("mvimport");
this.addKey("mvim"); this.addKey("mvim");
this.addKey("mv import"); this.addKey("mv import");