OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't let Player#getLocale return null

Browse source 
Thanks for reporting @MatrixTunnel
This commit is contained in:
Zach Brown 2017-08-11 18:16:00 -05:00
parent a8508dc5df
commit bab98cf5ff
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
View file

@ -1,11 +1,11 @@
From f27f5cde237dc3ea61e03600d2ad87315dc29931 Mon Sep 17 00:00:00 2001 From 4d9e75fcdf46bd479e8c6b6884d165640394c6d4 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com> From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500 Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ccd4cabcd..6271d28a2 100644 index e9377ca3..15a448d7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand; @@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
@ -45,20 +45,31 @@ index ccd4cabcd..6271d28a2 100644
this.cm = packetplayinsettings.d(); this.cm = packetplayinsettings.d();
this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e())); this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 17a14fdc0..b65ac0c7e 100644 index 17a14fdc..41330c2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1723,7 +1723,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1585,8 +1585,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
- return getHandle().locale;
-
+ // Paper start - Locale change event
+ final String locale = getHandle().locale;
+ return locale != null ? locale : "en_us";
+ // Paper end
}
public void setAffectsSpawning(boolean affects) {
@@ -1723,7 +1725,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public String getLocale() public String getLocale()
{ {
- return getHandle().locale; - return getHandle().locale;
+ // Paper start - Locale change event + return CraftPlayer.this.getLocale(); // Paper
+ final String locale = getHandle().locale;
+ return locale != null ? locale : "en_us";
} }
@Override @Override
-- --
2.13.3.windows.1 2.14.1