13
0
geforkt von Mirrors/Paper
Paper/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
Shane Freeder ea855e2b46 Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Developers!: You will need to clean up your work/Minecraft/1.13.2 folder
for this

Also, restore a patch that was dropped in the last upstream

Bukkit Changes:
279eeab3 Fix command description not being set
96e2bb18 Remove debug print from SyntheticEventTest

CraftBukkit Changes:
d3ed1516 Fix dangerously threaded beacons
217a293d Don't relocate joptsimple to allow --help to work.
1be05a21 Prepare for imminent Java 12 release
a49270b2 Mappings Update
5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports

Spigot Changes:
e6eb36f2 Rebuild patches
2019-03-20 01:55:16 +00:00

38 Zeilen
2.0 KiB
Diff

From c1b1907746b894381dc0eace9190858895d9555f 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 8227b375e..cc750eb3e 100644
--- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
+++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
@@ -171,7 +171,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
}
public void registerOutgoingPluginChannel(@NotNull Plugin plugin, @NotNull 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 c15fa0039..31ff2f61d 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.21.0