Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
2641c02193
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: 69fa4695 Add some missing deprecation annotations f850da2e Update Maven plugins/versions 8d8400db Use regular compiler seeing as ECJ doesn't support Java 21 JRE c29e1688 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 07bce714 SPIGOT-7355: More field renames and fixes 6a8ea764 Fix bad merge in penultimate commit 50a7920c Fix imports in previous commit 83640dd1 PR-995: Add required feature to MinecraftExperimental for easy lookups fc1f96cf BUILDTOOLS-676: Downgrade Maven compiler version CraftBukkit Changes: 90f1059ba Fix item placement 661afb43c SPIGOT-7633: Clearer error message for missing particle data 807b465b3 SPIGOT-7634: Armadillo updates infrequently 590cf09a8 Fix unit tests always seeing Mojang server as unavailable 7c7ac5eb2 SPIGOT-7636: Fix clearing ItemMeta 4a72905cf SPIGOT-7635: Fix Player#transfer and cookie methods ebb50e136 Fix incorrect Vault implementation b33fed8b7 Update Maven plugins/versions 6f00f0608 SPIGOT-7632: Control middle clicking chest does not copy contents db821f405 Use regular compiler seeing as ECJ doesn't support Java 21 JRE 8a2976737 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 0297f87bb SPIGOT-7355: More field renames and fixes 2d03bdf6a SPIGOT-7629: Fix loading banner patterns e77951fac Fix equality of deserialized display names c66f3e4fd SPIGOT-7631: Fix deserialisation of BlockStateMeta 9c2c7be8d SPIGOT-7630: Fix crash saving unticked leashed entities 8c1e7c841 PR-1384: Disable certain PlayerProfile tests, if Mojang's services or internet are not available ced93d572 SPIGOT-7626: sendSignChange() has no effect c77362cae SPIGOT-7625: ItemStack with lore cannot be serialized in 1.20.5 ff2004387 SPIGOT-7620: Fix server crash when hoppers transfer items to double chests 8b4abeb03 BUILDTOOLS-676: Downgrade Maven compiler version
57 Zeilen
3.5 KiB
Diff
57 Zeilen
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 28 Jun 2020 19:08:41 -0400
|
|
Subject: [PATCH] Improve Legacy Component serialization size
|
|
|
|
Don't constantly send format: false for all formatting options when parent already
|
|
has it false
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
|
|
index 51094fe6e37d3c0fad2682353f8de3d1b9c9aef5..42ab6e0ba77fb2f0350bee72488e905074989b4d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
|
|
@@ -47,6 +47,7 @@ public final class CraftChatMessage {
|
|
// Separate pattern with no group 3, new lines are part of previous string
|
|
private static final Pattern INCREMENTAL_PATTERN_KEEP_NEWLINES = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-orx])|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " ]|$))))", Pattern.CASE_INSENSITIVE);
|
|
// ChatColor.b does not explicitly reset, its more of empty
|
|
+ private static final Style EMPTY = Style.EMPTY.withItalic(false); // Paper - Improve Legacy Component serialization size
|
|
private static final Style RESET = Style.EMPTY.withBold(false).withItalic(false).withUnderlined(false).withStrikethrough(false).withObfuscated(false);
|
|
|
|
private final List<Component> list = new ArrayList<Component>();
|
|
@@ -68,6 +69,7 @@ public final class CraftChatMessage {
|
|
Matcher matcher = (keepNewlines ? StringMessage.INCREMENTAL_PATTERN_KEEP_NEWLINES : StringMessage.INCREMENTAL_PATTERN).matcher(message);
|
|
String match = null;
|
|
boolean needsAdd = false;
|
|
+ boolean hasReset = false; // Paper - Improve Legacy Component serialization size
|
|
while (matcher.find()) {
|
|
int groupId = 0;
|
|
while ((match = matcher.group(++groupId)) == null) {
|
|
@@ -113,7 +115,26 @@ public final class CraftChatMessage {
|
|
throw new AssertionError("Unexpected message format");
|
|
}
|
|
} else { // Color resets formatting
|
|
- this.modifier = StringMessage.RESET.withColor(format);
|
|
+ // Paper start - Improve Legacy Component serialization size
|
|
+ Style previous = modifier;
|
|
+ modifier = (!hasReset ? RESET : EMPTY).withColor(format);
|
|
+ hasReset = true;
|
|
+ if (previous.isBold()) {
|
|
+ modifier = modifier.withBold(false);
|
|
+ }
|
|
+ if (previous.isItalic()) {
|
|
+ modifier = modifier.withItalic(false);
|
|
+ }
|
|
+ if (previous.isObfuscated()) {
|
|
+ modifier = modifier.withObfuscated(false);
|
|
+ }
|
|
+ if (previous.isStrikethrough()) {
|
|
+ modifier = modifier.withStrikethrough(false);
|
|
+ }
|
|
+ if (previous.isUnderlined()) {
|
|
+ modifier = modifier.withUnderlined(false);
|
|
+ }
|
|
+ // Paper end - Improve Legacy Component serialization size
|
|
}
|
|
needsAdd = true;
|
|
break;
|