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
2021-03-16 07:19:45 +00:00
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
2021-05-15 20:36:15 +00:00
index cda0e7f8f9a9d66ac4e5a3f52609a4271bf0c4b5..3f1f8f7fe9452f66b18a08ef480d50ef78ad3351 100644
2021-03-16 07:19:45 +00:00
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
2021-05-15 20:36:15 +00:00
@@ -1695,7 +1695,7 @@ 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
2021-02-21 19:45:33 +00:00
+ public String locale = null; // CraftBukkit - add, lowercase // Paper - default to null
public java.util.Locale adventure$locale = java.util.Locale.US; // Paper
2020-06-25 11:00:35 +00:00
public void a(PacketPlayInSettings packetplayinsettings) {
// CraftBukkit start
2021-05-15 20:36:15 +00:00
@@ -1703,9 +1703,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
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;
2021-02-21 19:45:33 +00:00
// Paper start
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
2021-05-14 12:52:03 +00:00
index 4bb57229c045956bab631982e12c0fc420db450e..5698ef90bfeceec37eaf7f23361246ef125b3cd1 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
2021-05-14 12:52:03 +00:00
@@ -1877,8 +1877,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2021-05-09 20:50:09 +00:00
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