Merge pull request #259 from SpigotMC/master

Merge Upstream 1.14.3
HexagonMC · Jul 2, 2019 · 6824464 · 6824464
2 parents a53be5e + 941d7f7
commit 6824464
Show file tree

Hide file tree

Showing 5 changed files with 4,338 additions and 1 deletion.
diff --git a/chat/src/main/java/net/md_5/bungee/chat/TranslationRegistry.java b/chat/src/main/java/net/md_5/bungee/chat/TranslationRegistry.java
@@ -34,6 +34,13 @@ public final class TranslationRegistry
         {
         }
 
+        try
+        {
+            INSTANCE.addProvider( new JsonProvider( "/mojang-translations/en_us.json" ) );
+        } catch ( Exception ex )
+        {
+        }
+
         try
         {
             INSTANCE.addProvider( new ResourceBundleProvider( "mojang-translations/en_US" ) );
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,13 @@ public final class TranslationRegistry @@
             {
             }
+            try
+            {
+                INSTANCE.addProvider( new JsonProvider( "/mojang-translations/en_us.json" ) );
+            } catch ( Exception ex )
+            {
+            }
             try
             {
                 INSTANCE.addProvider( new ResourceBundleProvider( "mojang-translations/en_US" ) );
@@ Expand Down @@