2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2018-07-15 01:53:17 +00:00
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
2020-09-10 23:47:58 +00:00
index 863f779453bb028d6452292663fd1e41ab434165..ed29b3cdbc0137f81d586207d4082a02d8ef73b5 100644
2018-07-15 01:53:17 +00:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
2020-08-26 08:22:13 +00:00
@@ -1540,16 +1540,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2020-06-25 11:00:35 +00:00
return s;
}
2018-07-15 01:53:17 +00:00
2020-06-25 11:00:35 +00:00
- public String locale = "en_us"; // CraftBukkit - add, lowercase
2018-07-15 01:53:17 +00:00
+ public String locale = null; // CraftBukkit - lowercase // Paper - default to null
2020-06-25 11:00:35 +00:00
public void a(PacketPlayInSettings packetplayinsettings) {
// CraftBukkit start
if (getMainHand() != packetplayinsettings.getMainHand()) {
2018-07-15 01:53:17 +00:00
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
this.server.server.getPluginManager().callEvent(event);
}
2020-06-25 11:00:35 +00:00
- if (!this.locale.equals(packetplayinsettings.locale)) {
+ if (this.locale == null || !this.locale.equals(packetplayinsettings.locale)) { // Paper - check for null
PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(getBukkitEntity(), packetplayinsettings.locale);
2018-07-15 01:53:17 +00:00
this.server.server.getPluginManager().callEvent(event);
2020-08-25 02:22:08 +00:00
+ new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.locale, packetplayinsettings.locale).callEvent(); // Paper
2018-07-15 01:53:17 +00:00
}
2020-06-26 01:58:00 +00:00
this.locale = packetplayinsettings.locale;
2018-12-08 10:09:55 +00:00
this.clientViewDistance = packetplayinsettings.viewDistance;
2018-07-15 01:53:17 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2020-08-25 02:22:08 +00:00
index 81beabd053c024b0fc4d0948b94a8ff789cb1ba6..da264f118fca10bc7ff758e702c11f9d4885d2c2 100644
2018-07-15 01:53:17 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2020-08-25 02:22:08 +00:00
@@ -1793,8 +1793,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2018-07-15 01:53:17 +00:00
@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
}
// Paper start