mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-04 18:01:17 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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 Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
38 lines
2.0 KiB
Diff
38 lines
2.0 KiB
Diff
From 48dfc4dd10a6ed04373569ef4514f2c7cfb346f5 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 1d061412c..6fda7f3aa 100644
|
|
--- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
|
|
+++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
|
|
@@ -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
|
|
diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
|
|
index dce3d619a..7e2335ed8 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
|
|
|