diff --git a/api/src/main/java/net/md_5/bungee/api/CommandSender.java b/api/src/main/java/net/md_5/bungee/api/CommandSender.java
index 962489351..4a8f6bcd4 100644
--- a/api/src/main/java/net/md_5/bungee/api/CommandSender.java
+++ b/api/src/main/java/net/md_5/bungee/api/CommandSender.java
@@ -36,7 +36,7 @@ public interface CommandSender
      *
      * @param message the message to send
      */
-    public void sendMessage(BaseComponent[] message);
+    public void sendMessage(BaseComponent... message);
 
     /**
      * Send a message to this sender.
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
index 06155010c..f2ef12d05 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
@@ -240,7 +240,7 @@ public abstract class ProxyServer
      *
      * @param message the message to broadcast
      */
-    public abstract void broadcast(BaseComponent[] message);
+    public abstract void broadcast(BaseComponent... message);
 
     /**
      * Send the specified message to the console and all connected players.
diff --git a/api/src/main/java/net/md_5/bungee/api/chat/BaseComponent.java b/api/src/main/java/net/md_5/bungee/api/chat/BaseComponent.java
index 4162267dd..f004a3303 100644
--- a/api/src/main/java/net/md_5/bungee/api/chat/BaseComponent.java
+++ b/api/src/main/java/net/md_5/bungee/api/chat/BaseComponent.java
@@ -50,7 +50,7 @@ public abstract class BaseComponent
         setObfuscated( old.isObfuscatedRaw() );
     }
 
-    public static String toLegacyText(BaseComponent[] components)
+    public static String toLegacyText(BaseComponent... components)
     {
         StringBuilder builder = new StringBuilder();
         for ( BaseComponent msg : components )
@@ -60,7 +60,7 @@ public abstract class BaseComponent
         return builder.toString();
     }
 
-    public static String toPlainText(BaseComponent[] components)
+    public static String toPlainText(BaseComponent... components)
     {
         StringBuilder builder = new StringBuilder();
         for ( BaseComponent msg : components )
diff --git a/api/src/main/java/net/md_5/bungee/api/connection/Connection.java b/api/src/main/java/net/md_5/bungee/api/connection/Connection.java
index fb1461644..4e2068b91 100644
--- a/api/src/main/java/net/md_5/bungee/api/connection/Connection.java
+++ b/api/src/main/java/net/md_5/bungee/api/connection/Connection.java
@@ -39,7 +39,7 @@ public interface Connection
      * @param reason the reason shown to the player / sent to the server on
      * disconnect
      */
-    void disconnect(BaseComponent[] reason);
+    void disconnect(BaseComponent... reason);
 
     /**
      * Disconnects this end of the connection for the specified reason. If this
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index baf0ee116..4b746c95c 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -493,7 +493,7 @@ public class BungeeCord extends ProxyServer
     }
 
     @Override
-    public void broadcast(BaseComponent[] message)
+    public void broadcast(BaseComponent... message)
     {
         getConsole().sendMessage( BaseComponent.toLegacyText( message ) );
         broadcast( new Chat( ComponentSerializer.toString( message ) ) );
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
index e86240bd9..b8e35b129 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
@@ -47,7 +47,7 @@ public class ServerConnection implements Server
     }
 
     @Override
-    public void disconnect(BaseComponent[] reason)
+    public void disconnect(BaseComponent... reason)
     {
         if ( !ch.isClosed() )
         {
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 6045b21fb..e51ec343e 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -263,7 +263,7 @@ public final class UserConnection implements ProxiedPlayer
     }
 
     @Override
-    public void disconnect(BaseComponent[] reason)
+    public void disconnect(BaseComponent... reason)
     {
         disconnect0( reason );
     }
@@ -271,10 +271,10 @@ public final class UserConnection implements ProxiedPlayer
     @Override
     public void disconnect(BaseComponent reason)
     {
-        disconnect0( new BaseComponent[]{reason} );
+        disconnect0( reason );
     }
 
-    public synchronized void disconnect0(BaseComponent[] reason)
+    public synchronized void disconnect0(BaseComponent ...reason)
     {
         if ( ch.getHandle().isActive() )
         {
@@ -311,7 +311,7 @@ public final class UserConnection implements ProxiedPlayer
     }
 
     @Override
-    public void sendMessage(BaseComponent[] message)
+    public void sendMessage(BaseComponent... message)
     {
         unsafe().sendPacket( new Chat( ComponentSerializer.toString( message ) ) );
     }
diff --git a/proxy/src/main/java/net/md_5/bungee/chat/ComponentSerializer.java b/proxy/src/main/java/net/md_5/bungee/chat/ComponentSerializer.java
index 58dbc3f1b..c019f7ac6 100644
--- a/proxy/src/main/java/net/md_5/bungee/chat/ComponentSerializer.java
+++ b/proxy/src/main/java/net/md_5/bungee/chat/ComponentSerializer.java
@@ -38,7 +38,7 @@ public class ComponentSerializer implements JsonSerializer<BaseComponent>, JsonD
         return gson.toJson( component );
     }
 
-    public static String toString(BaseComponent[] components)
+    public static String toString(BaseComponent... components)
     {
         return gson.toJson( components );
     }
diff --git a/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java b/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java
index ba159474e..d6e8b79fb 100644
--- a/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java
+++ b/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java
@@ -36,7 +36,7 @@ public class ConsoleCommandSender implements CommandSender
     }
 
     @Override
-    public void sendMessage(BaseComponent[] message)
+    public void sendMessage(BaseComponent... message)
     {
         sendMessage( BaseComponent.toLegacyText( message ) );
     }
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 4a326c243..9d33c05e5 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -406,7 +406,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
     }
 
     @Override
-    public void disconnect(BaseComponent[] reason)
+    public void disconnect(BaseComponent... reason)
     {
         if ( !ch.isClosed() )
         {