OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages 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
Show stats 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) {
channel = validateAndCorrectChannel(channel);
return channel.contains("minecraft") && !channel.equals("minecraft:brand");
return channel.equals("minecraft:register") || channel.equals("minecraft:unregister"); // Paper
}
@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"));
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"));
}