Merged branch 'master' from 'https://github.com/SpigotMC/BungeeCord'

api/src/main/java/net/md_5/bungee/Util.java

@@ -29,7 +29,12 @@ public static InetSocketAddress getAddr(String hostline)
             uri = new URI( "tcp://" + hostline );
         } catch ( URISyntaxException ex )
         {
-            throw new IllegalArgumentException( "Bad hostline", ex );
+            throw new IllegalArgumentException( "Bad hostline: " + hostline, ex );
+        }
+
+        if ( uri.getHost() == null )
+        {
+            throw new IllegalArgumentException( "Invalid host/address: " + hostline );
         }
 
         return new InetSocketAddress( uri.getHost(), ( uri.getPort() ) == -1 ? DEFAULT_PORT : uri.getPort() );

api/src/main/java/net/md_5/bungee/api/config/ServerInfo.java

@@ -43,6 +43,22 @@ public interface ServerInfo
      */
     String getMotd();
 
+    /**
+     * Whether this server is restricted and therefore only players with the
+     * given permission can access it.
+     *
+     * @return if restricted
+     */
+    boolean isRestricted();
+
+    /**
+     * Get the permission required to access this server. Only enforced when the
+     * server is restricted.
+     *
+     * @return access permission
+     */
+    String getPermission();
+
     /**
      * Whether the player can access this server. It will only return false when
      * the player has no permission and this server is restricted.

api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java

@@ -107,7 +107,7 @@ public enum MainHand
      * @param target the new server to connect to
      * @param callback the method called when the connection is complete, or
      * when an exception is encountered. The boolean parameter denotes success
-     * or failure.
+     * (true) or failure (false).
      */
     void connect(ServerInfo target, Callback<Boolean> callback);
 
@@ -119,7 +119,7 @@ public enum MainHand
      * @param target the new server to connect to
      * @param callback the method called when the connection is complete, or
      * when an exception is encountered. The boolean parameter denotes success
-     * or failure.
+     * (true) or failure (false).
      * @param reason the reason for connecting to the new server
      */
     void connect(ServerInfo target, Callback<Boolean> callback, ServerConnectEvent.Reason reason);

api/src/main/java/net/md_5/bungee/api/event/AsyncEvent.java

@@ -1,13 +1,14 @@
 package net.md_5.bungee.api.event;
 
 import com.google.common.base.Preconditions;
-import java.util.Collections;
-import java.util.Set;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import lombok.AccessLevel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.ToString;
 import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.plugin.Event;
@@ -19,13 +20,14 @@
  * @param <T> Type of this event
  */
 @Data
+@Getter(AccessLevel.NONE)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class AsyncEvent<T> extends Event
 {
 
     private final Callback<T> done;
-    private final Set<Plugin> intents = Collections.newSetFromMap( new ConcurrentHashMap<Plugin, Boolean>() );
+    private final Map<Plugin, AtomicInteger> intents = new ConcurrentHashMap<>();
     private final AtomicBoolean fired = new AtomicBoolean();
     private final AtomicInteger latch = new AtomicInteger();
 
@@ -43,30 +45,40 @@ public void postCall()
     /**
      * Register an intent that this plugin will continue to perform work on a
      * background task, and wishes to let the event proceed once the registered
-     * background task has completed.
+     * background task has completed. Multiple intents can be registered by a
+     * plugin, but the plugin must complete the same amount of intents for the
+     * event to proceed.
      *
      * @param plugin the plugin registering this intent
      */
     public void registerIntent(Plugin plugin)
     {
         Preconditions.checkState( !fired.get(), "Event %s has already been fired", this );
-        Preconditions.checkState( !intents.contains( plugin ), "Plugin %s already registered intent for event %s", plugin, this );
 
-        intents.add( plugin );
+        AtomicInteger intentCount = intents.get( plugin );
+        if ( intentCount == null )
+        {
+            intents.put( plugin, new AtomicInteger( 1 ) );
+        } else
+        {
+            intentCount.incrementAndGet();
+        }
         latch.incrementAndGet();
     }
 
     /**
-     * Notifies this event that this plugin has done all its required processing
-     * and wishes to let the event proceed.
+     * Notifies this event that this plugin has completed an intent and wishes
+     * to let the event proceed once all intents have been completed.
      *
      * @param plugin a plugin which has an intent registered for this event
      */
     @SuppressWarnings("unchecked")
     public void completeIntent(Plugin plugin)
     {
-        Preconditions.checkState( intents.contains( plugin ), "Plugin %s has not registered intent for event %s", plugin, this );
-        intents.remove( plugin );
+        AtomicInteger intentCount = intents.get( plugin );
+        Preconditions.checkState( intentCount != null && intentCount.get() > 0, "Plugin %s has not registered intents for event %s", plugin, this );
+
+        intentCount.decrementAndGet();
         if ( fired.get() )
         {
             if ( latch.decrementAndGet() == 0 )

api/src/main/java/net/md_5/bungee/api/event/ChatEvent.java

@@ -3,8 +3,11 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.Connection;
 import net.md_5.bungee.api.plugin.Cancellable;
+import net.md_5.bungee.api.plugin.PluginManager;
 
 /**
  * Event called when a player sends a message to a server.
@@ -39,4 +42,25 @@ public boolean isCommand()
     {
         return message.length() > 0 && message.charAt( 0 ) == '/';
     }
+
+    /**
+     * Checks whether this message is run on this proxy server.
+     *
+     * @return if this command runs on the proxy
+     * @see PluginManager#isExecutableCommand(java.lang.String,
+     * net.md_5.bungee.api.CommandSender)
+     */
+    public boolean isProxyCommand()
+    {
+        if ( !isCommand() )
+        {
+            return false;
+        }
+
+        int index = message.indexOf( " " );
+        String commandName = ( index == -1 ) ? message.substring( 1 ) : message.substring( 1, index );
+        CommandSender sender = ( getSender() instanceof CommandSender ) ? (CommandSender) getSender() : null;
+
+        return ProxyServer.getInstance().getPluginManager().isExecutableCommand( commandName, sender );
+    }
 }

api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java

@@ -111,6 +111,32 @@ public void unregisterCommands(Plugin plugin)
         }
     }
 
+    private Command getCommandIfEnabled(String commandName, CommandSender sender)
+    {
+        String commandLower = commandName.toLowerCase( Locale.ROOT );
+
+        // Check if command is disabled when a player sent the command
+        if ( ( sender instanceof ProxiedPlayer ) && proxy.getDisabledCommands().contains( commandLower ) )
+        {
+            return null;
+        }
+
+        return commandMap.get( commandLower );
+    }
+
+    /**
+     * Checks if the command is registered and can possibly be executed by the
+     * sender (without taking permissions into account).
+     *
+     * @param commandName the name of the command
+     * @param sender the sender executing the command
+     * @return whether the command will be handled
+     */
+    public boolean isExecutableCommand(String commandName, CommandSender sender)
+    {
+        return getCommandIfEnabled( commandName, sender ) != null;
+    }
+
     public boolean dispatchCommand(CommandSender sender, String commandLine)
     {
         return dispatchCommand( sender, commandLine, null );
@@ -133,12 +159,7 @@ public boolean dispatchCommand(CommandSender sender, String commandLine, List<St
             return false;
         }
 
-        String commandName = split[0].toLowerCase( Locale.ROOT );
-        if ( sender instanceof ProxiedPlayer && proxy.getDisabledCommands().contains( commandName ) )
-        {
-            return false;
-        }
-        Command command = commandMap.get( commandName );
+        Command command = getCommandIfEnabled( split[0], sender );
         if ( command == null )
         {
             return false;

api/src/test/java/net/md_5/bungee/api/ServerConnectRequestTest.java

@@ -38,11 +38,23 @@ public String getMotd()
         }
 
         @Override
-        public boolean canAccess(CommandSender sender)
+        public boolean isRestricted()
         {
             return false;
         }
 
+        @Override
+        public String getPermission()
+        {
+            return null;
+        }
+
+        @Override
+        public boolean canAccess(CommandSender sender)
+        {
+            return true;
+        }
+
         @Override
         public void sendData(String channel, byte[] data)
         {

chat/src/main/java/net/md_5/bungee/api/chat/BaseComponent.java

@@ -8,11 +8,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import net.md_5.bungee.api.chat.ComponentBuilder.FormatRetention;
 
 @Setter
 @ToString(exclude = "parent")
+@EqualsAndHashCode
 @NoArgsConstructor
 public abstract class BaseComponent
 {

chat/src/main/java/net/md_5/bungee/api/chat/ClickEvent.java

@@ -1,11 +1,13 @@
 package net.md_5.bungee.api.chat;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
 @Getter
 @ToString
+@EqualsAndHashCode
 @RequiredArgsConstructor
 public final class ClickEvent
 {

chat/src/main/java/net/md_5/bungee/api/chat/ComponentBuilder.java

@@ -146,6 +146,19 @@ public ComponentBuilder append(String text)
         return append( text, FormatRetention.ALL );
     }
 
+    /**
+     * Parse text to BaseComponent[] with colors and format, appends the text to
+     * the builder and makes it the current target for formatting. The component
+     * will have all the formatting from previous part.
+     *
+     * @param text the text to append
+     * @return this ComponentBuilder for chaining
+     */
+    public ComponentBuilder appendLegacy(String text)
+    {
+        return append( TextComponent.fromLegacyText( text ) );
+    }
+
     /**
      * Appends the text to the builder and makes it the current target for
      * formatting. You can specify the amount of formatting retained from

chat/src/main/java/net/md_5/bungee/api/chat/HoverEvent.java

@@ -1,11 +1,13 @@
 package net.md_5.bungee.api.chat;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
 @Getter
 @ToString
+@EqualsAndHashCode
 @RequiredArgsConstructor
 public final class HoverEvent
 {

chat/src/main/java/net/md_5/bungee/api/chat/KeybindComponent.java

@@ -1,5 +1,6 @@
 package net.md_5.bungee.api.chat;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -10,6 +11,7 @@
 @Setter
 @ToString
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public final class KeybindComponent extends BaseComponent
 {
 

chat/src/main/java/net/md_5/bungee/api/chat/ScoreComponent.java

@@ -1,6 +1,7 @@
 package net.md_5.bungee.api.chat;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -26,6 +27,7 @@
 @Setter
 @ToString
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public final class ScoreComponent extends BaseComponent
 {
 

chat/src/main/java/net/md_5/bungee/api/chat/SelectorComponent.java

@@ -1,6 +1,7 @@
 package net.md_5.bungee.api.chat;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,6 +23,7 @@
 @Setter
 @ToString
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public final class SelectorComponent extends BaseComponent
 {
 

chat/src/main/java/net/md_5/bungee/api/chat/TextComponent.java

@@ -9,10 +9,12 @@
 import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import lombok.EqualsAndHashCode;
 
 @Getter
 @Setter
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public final class TextComponent extends BaseComponent
 {
 

chat/src/main/java/net/md_5/bungee/api/chat/TranslatableComponent.java

@@ -8,13 +8,15 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import net.md_5.bungee.chat.TranslationRegistry;
 
 @Getter
 @Setter
 @ToString
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public final class TranslatableComponent extends BaseComponent
 {