summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2014-01-06 14:08:05 -0600
committerWesley Wolfe <weswolf@aol.com>2014-01-06 14:20:22 -0600
commitc83a3385539678daf4437f53da20f4b405cf6fc2 (patch)
tree64da5e14f7c420f44e146ac01bacfb8af44a6a72 /src/main
parentf383b6c490bd55993e37c2940613315501838e2e (diff)
downloadbukkit-c83a3385539678daf4437f53da20f4b405cf6fc2.tar
bukkit-c83a3385539678daf4437f53da20f4b405cf6fc2.tar.gz
bukkit-c83a3385539678daf4437f53da20f4b405cf6fc2.tar.lz
bukkit-c83a3385539678daf4437f53da20f4b405cf6fc2.tar.xz
bukkit-c83a3385539678daf4437f53da20f4b405cf6fc2.zip
Fix some messages
Addresses BUKKIT-5272, BUKKIT-5282, and BUKKIT-5283
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/command/defaults/SayCommand.java2
-rw-r--r--src/main/java/org/bukkit/plugin/java/PluginClassLoader.java2
-rw-r--r--src/main/java/org/bukkit/plugin/messaging/ChannelNotRegisteredException.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/command/defaults/SayCommand.java b/src/main/java/org/bukkit/command/defaults/SayCommand.java
index c48c5c30..658fe217 100644
--- a/src/main/java/org/bukkit/command/defaults/SayCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SayCommand.java
@@ -14,7 +14,7 @@ import com.google.common.collect.ImmutableList;
public class SayCommand extends VanillaCommand {
public SayCommand() {
super("say");
- this.description = "Broadcasts the given message as the console";
+ this.description = "Broadcasts the given message as the sender";
this.usageMessage = "/say <message ...>";
this.setPermission("bukkit.command.say");
}
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index c34fb2dc..13f86338 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -95,7 +95,7 @@ final class PluginClassLoader extends URLClassLoader {
Validate.notNull(javaPlugin, "Initializing plugin cannot be null");
Validate.isTrue(javaPlugin.getClass().getClassLoader() == this, "Cannot initialize plugin outside of this class loader");
if (this.plugin != null || this.pluginInit != null) {
- throw new IllegalArgumentException("Plugin already intialized!", pluginState);
+ throw new IllegalArgumentException("Plugin already initialized!", pluginState);
}
pluginState = new IllegalStateException("Initial initialization");
diff --git a/src/main/java/org/bukkit/plugin/messaging/ChannelNotRegisteredException.java b/src/main/java/org/bukkit/plugin/messaging/ChannelNotRegisteredException.java
index c3a797dc..2266f176 100644
--- a/src/main/java/org/bukkit/plugin/messaging/ChannelNotRegisteredException.java
+++ b/src/main/java/org/bukkit/plugin/messaging/ChannelNotRegisteredException.java
@@ -10,6 +10,6 @@ public class ChannelNotRegisteredException extends RuntimeException {
}
public ChannelNotRegisteredException(String channel) {
- super("Attempted to send a plugin message through an unregistered channel ('" + channel + "'.");
+ super("Attempted to send a plugin message through the unregistered channel `" + channel + "'.");
}
}