Merge pull request #107 from SpigotMC/master

Merge with SpigotMC
HexagonMC · Dec 1, 2016 · 708ac94 · 708ac94
2 parents 0df78e3 + ea66802
commit 708ac94
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 6 deletions.
diff --git a/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java b/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
@@ -1,9 +1,13 @@
 package net.md_5.bungee.api.event;
 
+import lombok.AccessLevel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Setter;
 import lombok.ToString;
 import net.md_5.bungee.api.Callback;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.plugin.Cancellable;
 
@@ -23,7 +27,8 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
     /**
      * Message to use when kicking if this event is canceled.
      */
-    private String cancelReason;
+    @Setter(AccessLevel.NONE)
+    private BaseComponent[] cancelReasonComponents;
     /**
      * Connection attempting to login.
      */
@@ -34,4 +39,31 @@ public LoginEvent(PendingConnection connection, Callback<LoginEvent> done)
         super( done );
         this.connection = connection;
     }
+
+    /**
+     * @return reason to be displayed
+     * @deprecated Use component methods instead.
+     */
+    @Deprecated
+    public String getCancelReason()
+    {
+        return BaseComponent.toLegacyText( getCancelReasonComponents() );
+    }
+
+    /**
+     * @param cancelReason reason to be displayed
+     * @deprecated Use
+     * {@link #setCancelReason(net.md_5.bungee.api.chat.BaseComponent...)}
+     * instead.
+     */
+    @Deprecated
+    public void setCancelReason(String cancelReason)
+    {
+        setCancelReason( TextComponent.fromLegacyText( cancelReason ) );
+    }
+
+    public void setCancelReason(BaseComponent... cancelReason)
+    {
+        this.cancelReasonComponents = cancelReason;
+    }
 }
diff --git a/api/src/main/java/net/md_5/bungee/api/event/PreLoginEvent.java b/api/src/main/java/net/md_5/bungee/api/event/PreLoginEvent.java
@@ -1,9 +1,13 @@
 package net.md_5.bungee.api.event;
 
+import lombok.AccessLevel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Setter;
 import lombok.ToString;
 import net.md_5.bungee.api.Callback;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.plugin.Cancellable;
 
@@ -28,7 +32,8 @@ public class PreLoginEvent extends AsyncEvent<PreLoginEvent> implements Cancella
     /**
      * Message to use when kicking if this event is canceled.
      */
-    private String cancelReason;
+    @Setter(AccessLevel.NONE)
+    private BaseComponent[] cancelReasonComponents;
     /**
      * Connection attempting to login.
      */
@@ -39,4 +44,31 @@ public PreLoginEvent(PendingConnection connection, Callback<PreLoginEvent> done)
         super( done );
         this.connection = connection;
     }
+
+    /**
+     * @return reason to be displayed
+     * @deprecated Use component methods instead.
+     */
+    @Deprecated
+    public String getCancelReason()
+    {
+        return BaseComponent.toLegacyText( getCancelReasonComponents() );
+    }
+
+    /**
+     * @param cancelReason reason to be displayed
+     * @deprecated Use
+     * {@link #setCancelReason(net.md_5.bungee.api.chat.BaseComponent...)}
+     * instead.
+     */
+    @Deprecated
+    public void setCancelReason(String cancelReason)
+    {
+        setCancelReason( TextComponent.fromLegacyText( cancelReason ) );
+    }
+
+    public void setCancelReason(BaseComponent... cancelReason)
+    {
+        this.cancelReasonComponents = cancelReason;
+    }
 }
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -435,7 +435,7 @@ public void sendMessage(ChatMessageType position, BaseComponent... message)
         // Action bar on 1.8 doesn't display the new JSON formattings, legacy works - send it using this for now
         if ( position == ChatMessageType.ACTION_BAR && pendingConnection.getVersion() >= ProtocolConstants.MINECRAFT_1_8  && getPendingConnection().getVersion() <= ProtocolConstants.MINECRAFT_1_8 )
         {
-            sendMessage( position, ComponentSerializer.toString( new TextComponent( TextComponent.toLegacyText( message ) ) ) );
+            sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) );
         } else
         {
             sendMessage( position, ComponentSerializer.toString( message ) );
@@ -448,7 +448,7 @@ public void sendMessage(ChatMessageType position, BaseComponent message)
         // Action bar on 1.8 doesn't display the new JSON formattings, legacy works - send it using this for now
         if ( position == ChatMessageType.ACTION_BAR && pendingConnection.getVersion() >= ProtocolConstants.MINECRAFT_1_8  && getPendingConnection().getVersion() <= ProtocolConstants.MINECRAFT_1_8 )
         {
-            sendMessage( position, ComponentSerializer.toString( new TextComponent( TextComponent.toLegacyText( message ) ) ) );
+            sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) );
         } else
         {
             sendMessage( position, ComponentSerializer.toString( 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
@@ -360,7 +360,7 @@ public void done(PreLoginEvent result, Throwable error)
             {
                 if ( result.isCancelled() )
                 {
-                    disconnect( result.getCancelReason() );
+                    disconnect( result.getCancelReasonComponents() );
                     return;
                 }
                 if ( ch.isClosed() )
@@ -479,7 +479,7 @@ public void done(LoginEvent result, Throwable error)
             {
                 if ( result.isCancelled() )
                 {
-                    disconnect( result.getCancelReason() );
+                    disconnect( result.getCancelReasonComponents() );
                     return;
                 }
                 if ( ch.isClosed() )