Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 10:35:38 +01:00
Code Issues Projects Releases Wiki Activity

Change the reserved channel check to be sensible (#1610)

Browse Source
This commit is contained in:
DoNotSpamPls 2018-12-01 02:08:31 +02:00 committed by Zach
parent 3ef68e5f20
commit 0c74d4575c
3 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LICENSE.md
View File

@ -39,4 +39,5 @@ willies952002 <admin@domnian.com>
MicleBrick <miclebrick@outlook.com>
Trigary <trigary0@gmail.com>
rickyboy320 <rickw320@hotmail.com>
DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
```

37
Spigot-API-Patches/0170-Change-the-reserved-channel-check-to-be-sensible.patch Normal file
View File

@ -0,0 +1,37 @@
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

6
Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch
View File

@ -1,4 +1,4 @@
From d92a33da313b20dcf7bfcf7a9070c403e961444e Mon Sep 17 00:00:00 2001
From 59ba59cc95b4a0887b189efc1012a2c294a29e9d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 23 Oct 2018 20:25:05 -0400
Subject: [PATCH] Don't sleep after profile lookups if not needed
@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
the current one finished, resulting in 100ms lost per profile lookup
diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
index 26a743722..6ed3199c3 100644
index 71e48e87b..23f1447cf 100644
--- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
+++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
@@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
@ -32,5 +32,5 @@ index 26a743722..6ed3199c3 100644
try {
Thread.sleep(DELAY_BETWEEN_PAGES);
--
2.19.2
2.19.1