From bc9c12c067982e5513d59b88fb178b5a485f1841 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 25 Oct 2018 20:38:53 +1100
Subject: SPIGOT-4439: Allow minecraft:brand channel for use by plugins.

---
 src/main/java/org/bukkit/plugin/messaging/Messenger.java             | 3 +++
 src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java     | 2 +-
 src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/org/bukkit/plugin/messaging/Messenger.java b/src/main/java/org/bukkit/plugin/messaging/Messenger.java
index c9ef7e84..7aa1d81b 100644
--- a/src/main/java/org/bukkit/plugin/messaging/Messenger.java
+++ b/src/main/java/org/bukkit/plugin/messaging/Messenger.java
@@ -27,6 +27,9 @@ public interface Messenger {
 
     /**
      * Checks if the specified channel is a reserved name.
+     * <br>
+     * All channels within the "minecraft" namespace except for
+     * "minecraft:brand" are reserved.
      *
      * @param channel Channel name to check.
      * @return True if the channel is reserved, otherwise false.
diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
index 55a0360e..f21cae72 100644
--- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
+++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
@@ -170,7 +170,7 @@ public class StandardMessenger implements Messenger {
     public boolean isReservedChannel(String channel) {
         channel = validateAndCorrectChannel(channel);
 
-        return channel.contains("minecraft");
+        return channel.contains("minecraft") && !channel.equals("minecraft:brand");
     }
 
     public void registerOutgoingPluginChannel(Plugin plugin, String channel) {
diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
index cefbb0f9..c15fa003 100644
--- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
+++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
@@ -27,6 +27,7 @@ public class StandardMessengerTest {
         assertTrue(messenger.isReservedChannel("minecraft:unregister"));
         assertFalse(messenger.isReservedChannel("test:nregister"));
         assertTrue(messenger.isReservedChannel("minecraft:something"));
+        assertFalse(messenger.isReservedChannel("minecraft:brand"));
     }
 
     @Test
-- 
cgit v1.2.3