From 07247a1afd0e35593ad5ffc8270bcfa448fa1116 Mon Sep 17 00:00:00 2001 From: "main()" Date: Sun, 1 Jan 2012 17:28:44 +0100 Subject: [PATCH] ImportCommand now checks if the world was successfully imported. Fixes #359 --- .../onarandombox/MultiverseCore/commands/ImportCommand.java | 6 ++++-- .../onarandombox/MultiverseCore/test/TestWorldStuff.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java index 87ff747f..4c197a0c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java @@ -143,8 +143,10 @@ public class ImportCommand extends MultiverseCommand { if (worldFile.exists() && env != null) { Command.broadcastCommandMessage(sender, "Starting import of world '" + worldName + "'..."); - this.worldManager.addWorld(worldName, environment, null, generator, useSpawnAdjust); - Command.broadcastCommandMessage(sender, "Complete!"); + if (this.worldManager.addWorld(worldName, environment, null, generator, useSpawnAdjust)) + Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!"); + else + Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!"); } else if (env == null) { sender.sendMessage(ChatColor.RED + "FAILED."); sender.sendMessage("That world environment did not exist."); diff --git a/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldStuff.java b/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldStuff.java index 22ac387c..9508bc1d 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldStuff.java +++ b/src/test/java/com/onarandombox/MultiverseCore/test/TestWorldStuff.java @@ -131,7 +131,7 @@ public class TestWorldStuff { verify(mockCommandSender).sendMessage("Starting import of world 'world'..."); verify(mockCommandSender).sendMessage("Starting import of world 'world_nether'..."); verify(mockCommandSender).sendMessage("Starting import of world 'world_the_end'..."); - verify(mockCommandSender, VerificationModeFactory.times(3)).sendMessage("Complete!"); + verify(mockCommandSender, VerificationModeFactory.times(3)).sendMessage(ChatColor.GREEN + "Complete!"); } @Test