SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the reserved channel check to be sensible

Browse Source
This commit is contained in:
DoNotSpamPls
2018-10-23 19:32:55 +03:00
parent df6c6062ab
commit ad83a72cf5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-api/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
View File

@@ -172,7 +172,7 @@ public class StandardMessenger implements Messenger {
public boolean isReservedChannel(@NotNull String channel) { public boolean isReservedChannel(@NotNull String channel) {
channel = validateAndCorrectChannel(channel); channel = validateAndCorrectChannel(channel);
return channel.contains("minecraft") && !channel.equals("minecraft:brand"); return channel.equals("minecraft:register") || channel.equals("minecraft:unregister"); // Paper
} }
@Override @Override

4
paper-api/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
View File

@@ -26,8 +26,8 @@ public class StandardMessengerTest {
assertTrue(messenger.isReservedChannel("minecraft:register")); assertTrue(messenger.isReservedChannel("minecraft:register"));
assertFalse(messenger.isReservedChannel("test:register")); assertFalse(messenger.isReservedChannel("test:register"));
assertTrue(messenger.isReservedChannel("minecraft:unregister")); assertTrue(messenger.isReservedChannel("minecraft:unregister"));
assertFalse(messenger.isReservedChannel("test:nregister")); assertFalse(messenger.isReservedChannel("test:unregister")); // Paper - fix typo
assertTrue(messenger.isReservedChannel("minecraft:something")); assertFalse(messenger.isReservedChannel("minecraft:something")); // Paper - now less strict
assertFalse(messenger.isReservedChannel("minecraft:brand")); assertFalse(messenger.isReservedChannel("minecraft:brand"));
} }