From 336333acb1e6140556271545c71f784083559dcc Mon Sep 17 00:00:00 2001 From: Janmm14 Date: Wed, 24 Apr 2024 21:58:27 +0000 Subject: [PATCH] #3665: Small improvements to TranslatableComponent * Make TranslatableComponent format Pattern static * Fix TranslatableComponent copy constructor not copying fallback --- .../net/md_5/bungee/api/chat/TranslatableComponent.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chat/src/main/java/net/md_5/bungee/api/chat/TranslatableComponent.java b/chat/src/main/java/net/md_5/bungee/api/chat/TranslatableComponent.java index 13c095646a..402f72be22 100644 --- a/chat/src/main/java/net/md_5/bungee/api/chat/TranslatableComponent.java +++ b/chat/src/main/java/net/md_5/bungee/api/chat/TranslatableComponent.java @@ -19,7 +19,7 @@ public final class TranslatableComponent extends BaseComponent { - private final Pattern format = Pattern.compile( "%(?:(\\d+)\\$)?([A-Za-z%]|$)" ); + private static final Pattern FORMAT = Pattern.compile( "%(?:(\\d+)\\$)?([A-Za-z%]|$)" ); /** * The key into the Minecraft locale files to use for the translation. The @@ -44,10 +44,11 @@ public TranslatableComponent(TranslatableComponent original) { super( original ); setTranslate( original.getTranslate() ); + setFallback( original.getFallback() ); if ( original.getWith() != null ) { - List temp = new ArrayList(); + List temp = new ArrayList<>(); for ( BaseComponent baseComponent : original.getWith() ) { temp.add( baseComponent.duplicate() ); @@ -177,7 +178,7 @@ private void convert(StringBuilder builder, boolean applyFormat) trans = fallback; } - Matcher matcher = format.matcher( trans ); + Matcher matcher = FORMAT.matcher( trans ); int position = 0; int i = 0; while ( matcher.find( position ) )