Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
3b9db2b194
Upstream has released updates that appear 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: bb4e97c6 Add support for Java 23 bc6874dd Bump asm to 9.7.1 50e8a00b PR-1064: Add specific getTopInventory methods for InventoryView derivatives 758b0a0f SPIGOT-7911: Fix Location#isWorldLoaded() for re-loaded worlds 133a64a7 Improve Registry#getOrThrow messages be0f5957 PR-1058: Add tests for Minecraft registry <-> Bukkit fields d1b31df2 PR-1062: Clarify BeaconView documentation 3fab4384 PR-1060: Cache Material to BlockType and ItemType conversion 967a7301 SPIGOT-7906: Increase YAML nesting limit to 100 6ecf033d SPIGOT-7899: Smithing recipes don't require inputs CraftBukkit Changes: 0a7bd6c81 PR-1493: Improve reroute performance and add some tests 54941524c Add support for Java 23 f4d957fff SPIGOT-7915: Fix World#getKeepSpawnInMemory() using Spawn Radius rather than Spawn Chunk Radius ded183674 Fix HIDE_ENCHANTS flag in items without enchantments 308785a0a Bump asm to 9.7.1 and re-add ClassReader to ClassWriter 72ce823cd PR-1487: Add specific getTopInventory methods for InventoryView derivatives 11a5e840c SPIGOT-7907, PR-1484: Improve merchant recipe item matching behavior to more closely align with older versions 45b66f7e4 SPIGOT-7909: Always set HIDE_ENCHANTS flag to item if flag is set 963459791 Increase outdated build delay fc5b2d75f SPIGOT-7910: Fix launching breeze wind charge from API and improve dispenser launch API c7d6428f2 SPIGOT-7856, PR-1483: End platform not dropping items after replacing blocks 2a5572b52 SPIGOT-7780, PR-1482: Cannot edit chunks during unload event 527041ab5 SPIGOT-7902, PR-1477: Fix CraftMetaPotion#hasCustomEffects() does not check if customEffects (List) is empty 5529a1769 Implement base methods for tags 30fbdbaaf Improve Registry#getOrThrow messages 6b71a7322 PR-1475: Add tests for Minecraft registry <-> Bukkit fields 5f24c255c SPIGOT-7908: Mark junit-platform-suite-engine as test scope e4c92ef65 PR-1473: Change tests to use suites, to run tests in different environments and feature flags d25e1e722 PR-1481: Fix BeaconView#set[X]Effect(null) d69a05362 PR-1480: Fix PerMaterialTest#isEdible test running for legacy materials bb3284a89 PR-1479: Use custom #isBlock method in legacy init instead of the one in Material, since it relies on legacy being init 98c57cbbe SPIGOT-7904: Fix NPE for PlayerItemBreakEvent f35bae9ec Fix missing hasJukeboxPlayable 8a6f8b6d8 SPIGOT-7881: CTRL+Pick Block saves position data into item 7913b3be7 SPIGOT-7899: Smithing recipes don't require inputs
57 Zeilen
3.4 KiB
Diff
57 Zeilen
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
|
Date: Mon, 12 Aug 2024 18:38:19 +0200
|
|
Subject: [PATCH] Improve StandardMessenger exception messages
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/messaging/ChannelNameTooLongException.java b/src/main/java/org/bukkit/plugin/messaging/ChannelNameTooLongException.java
|
|
index 80ef8a2a342ff9dc16c98b5254cadd539f6ea0d9..ea73d9cd9d9d84731c083089d0b9913b4b1f92b6 100644
|
|
--- a/src/main/java/org/bukkit/plugin/messaging/ChannelNameTooLongException.java
|
|
+++ b/src/main/java/org/bukkit/plugin/messaging/ChannelNameTooLongException.java
|
|
@@ -9,7 +9,9 @@ public class ChannelNameTooLongException extends RuntimeException {
|
|
super("Attempted to send a Plugin Message to a channel that was too large. The maximum length a channel may be is " + Messenger.MAX_CHANNEL_SIZE + " chars.");
|
|
}
|
|
|
|
- public ChannelNameTooLongException(String channel) {
|
|
- super("Attempted to send a Plugin Message to a channel that was too large. The maximum length a channel may be is " + Messenger.MAX_CHANNEL_SIZE + " chars (attempted " + channel.length() + " - '" + channel + ".");
|
|
+ // Paper start
|
|
+ public ChannelNameTooLongException(int length, String shortenedChannel) {
|
|
+ super("Attempted to send a Plugin Message to a channel that was too large. The maximum length a channel may be is " + Messenger.MAX_CHANNEL_SIZE + " chars (attempted " + length + " - '" + shortenedChannel + ".");
|
|
+ // Paper end
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
|
|
index 6fda7f3aa68e76af64362e9afed70fc6a5e92986..230ecf9f9752b0369da3ba7aa6ce68b34a0814c5 100644
|
|
--- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
|
|
+++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
|
|
@@ -496,19 +496,26 @@ public class StandardMessenger implements Messenger {
|
|
if (channel.equals("bungeecord:main")) {
|
|
return "BungeeCord";
|
|
}
|
|
+ // Paper start - improve error message
|
|
if (channel.length() > Messenger.MAX_CHANNEL_SIZE) {
|
|
- throw new ChannelNameTooLongException(channel);
|
|
+ throw new ChannelNameTooLongException(channel.length(), shortened(channel));
|
|
}
|
|
if (channel.indexOf(':') == -1) {
|
|
- throw new IllegalArgumentException("Channel must contain : separator (attempted to use " + channel + ")");
|
|
+ throw new IllegalArgumentException("Channel must contain : separator (attempted to use " + shortened(channel) + ")");
|
|
}
|
|
if (!channel.toLowerCase(Locale.ROOT).equals(channel)) {
|
|
// TODO: use NamespacedKey validation here
|
|
- throw new IllegalArgumentException("Channel must be entirely lowercase (attempted to use " + channel + ")");
|
|
+ throw new IllegalArgumentException("Channel must be entirely lowercase (attempted to use " + shortened(channel) + ")");
|
|
}
|
|
return channel;
|
|
}
|
|
|
|
+ private static String shortened(String channel) {
|
|
+ channel = org.apache.commons.lang3.StringUtils.normalizeSpace(channel);
|
|
+ return channel.length() > 32 ? channel.substring(0, 32) + "..." : channel;
|
|
+ }
|
|
+ // Paper end - improve error message
|
|
+
|
|
/**
|
|
* Validates the input of a Plugin Message, ensuring the arguments are all
|
|
* valid.
|