From 0581415ae51b834c5b0e1b0b32e9272f9f92f6f9 Mon Sep 17 00:00:00 2001 From: "main()" Date: Wed, 19 Oct 2011 19:48:43 +0200 Subject: [PATCH] Added broadcast-messages (Closes #197) --- .../MultiverseCore/commands/CreateCommand.java | 9 ++++++--- .../MultiverseCore/commands/ImportCommand.java | 5 +++-- .../MultiverseCore/commands/LoadCommand.java | 5 +++-- .../MultiverseCore/commands/UnloadCommand.java | 5 +++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java index 3a3a0047..4e2a5d23 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java @@ -12,6 +12,7 @@ import com.onarandombox.MultiverseCore.utils.WorldManager; import com.pneumaticraft.commandhandler.CommandHandler; import org.bukkit.ChatColor; import org.bukkit.World.Environment; +import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissionDefault; @@ -61,11 +62,13 @@ public class CreateCommand extends MultiverseCommand { EnvironmentCommand.showEnvironments(sender); return; } - sender.sendMessage(ChatColor.AQUA + "Starting world creation..."); + + Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'..."); + if (this.worldManager.addWorld(worldName, environment, seed, generator)) { - sender.sendMessage(ChatColor.GREEN + "Complete!"); + Command.broadcastCommandMessage(sender, "Complete!"); } else { - sender.sendMessage(ChatColor.RED + "FAILED."); + Command.broadcastCommandMessage(sender, "FAILED."); } } } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java index 61a3b1f5..1c3d7628 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java @@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.utils.WorldManager; import org.bukkit.ChatColor; import org.bukkit.World.Environment; +import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissionDefault; @@ -57,9 +58,9 @@ public class ImportCommand extends MultiverseCommand { } if (new File(worldName).exists() && env != null) { - sender.sendMessage(ChatColor.AQUA + "Starting world import..."); + Command.broadcastCommandMessage(sender, "Starting import of world '" + worldName + "'..."); this.worldManager.addWorld(worldName, environment, null, generator); - sender.sendMessage(ChatColor.GREEN + "Complete!"); + Command.broadcastCommandMessage(sender, "Complete!"); return; } else if (env == null) { sender.sendMessage(ChatColor.RED + "FAILED."); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java index 63f9e88d..4c9dbeec 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java @@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.commands; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; +import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissionDefault; @@ -30,9 +31,9 @@ public class LoadCommand extends MultiverseCommand { @Override public void runCommand(CommandSender sender, List args) { if (this.plugin.getMVWorldManager().loadWorld(args.get(0))) { - sender.sendMessage("World Loaded!"); + Command.broadcastCommandMessage(sender, "Loaded world '" + args.get(0) + "'!"); } else { - sender.sendMessage("Error trying to load world!"); + sender.sendMessage("Error trying to load world '" + args.get(0) + "'!"); } } } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java index 325622a6..f49abe88 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java @@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.commands; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; +import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissionDefault; @@ -29,9 +30,9 @@ public class UnloadCommand extends MultiverseCommand { @Override public void runCommand(CommandSender sender, List args) { if (this.plugin.getMVWorldManager().unloadWorld(args.get(0))) { - sender.sendMessage("World Unloaded!"); + Command.broadcastCommandMessage(sender, "Unloaded world '" + args.get(0) + "'!"); } else { - sender.sendMessage("Error trying to unload world!"); + sender.sendMessage("Error trying to unload world '" + args.get(0) + "'!"); } } }