From eb7842870179959eb5cec665ae4e51cda37da706 Mon Sep 17 00:00:00 2001 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Date: Tue, 23 Oct 2018 19:32:55 +0300 Subject: [PATCH] Change the reserved channel check to be sensible diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java index f21cae72..865028d3 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") && !channel.equals("minecraft:brand"); + return channel.equals("minecraft:register") || channel.equals("minecraft:unregister"); // Paper } 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 c15fa003..31ff2f61 100644 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java @@ -25,8 +25,8 @@ public class StandardMessengerTest { assertTrue(messenger.isReservedChannel("minecraft:register")); assertFalse(messenger.isReservedChannel("test:register")); assertTrue(messenger.isReservedChannel("minecraft:unregister")); - assertFalse(messenger.isReservedChannel("test:nregister")); - assertTrue(messenger.isReservedChannel("minecraft:something")); + assertFalse(messenger.isReservedChannel("test:unregister")); // Paper - fix typo + assertFalse(messenger.isReservedChannel("minecraft:something")); // Paper - now less strict assertFalse(messenger.isReservedChannel("minecraft:brand")); } -- 2.19.1