Use null Locale by default

2016-04-19 14:09:31 -05:00
parent 1ac857b531
commit c9cf82340d
2 changed files with 28 additions and 16 deletions
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2435,7 +2435,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

    @Override
    public String getLocale() {
-        return this.getHandle().language;
+        // Paper start - Locale change event
+        final String locale = this.getHandle().language;
+        return locale != null ? locale : "en_us";
+        // Paper end
    }

    // Paper start