twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-26 09:42:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix server ignoring fallback for translatable components (#9134)

Browse Source
This commit is contained in:
Jakub Zacek
2023-04-20 09:05:41 +02:00
parent 992e145a16
commit b4e413f624
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
LICENSE.md
View File

@@ -58,4 +58,5 @@ Jakubk15 <jakubk15@protonmail.com>
Redned <redned235@gmail.com> Redned <redned235@gmail.com>
Luke Chambers <consolelogluke@gmail.com> Luke Chambers <consolelogluke@gmail.com>
Emily <emilia.lopezf.1999@gmail.com> Emily <emilia.lopezf.1999@gmail.com>
dawon <dawon@dawon.eu>
``` ```

3
patches/server/Adventure.patch
View File

@@ -799,7 +799,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ } + }
+ } + }
+ final @NotNull String translated = Language.getInstance().getOrDefault(translatable.key()); + final @Nullable String fallback = translatable.fallback();
+ final @NotNull String translated = Language.getInstance().getOrDefault(translatable.key(), fallback != null ? fallback : translatable.key());
+ +
+ final Matcher matcher = LOCALIZATION_PATTERN.matcher(translated); + final Matcher matcher = LOCALIZATION_PATTERN.matcher(translated);
+ final List<Component> args = translatable.args(); + final List<Component> args = translatable.args();