2020-05-06 11:48:49 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2018-07-15 03:53:17 +02: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-11-18 04:45:18 +01:00
index a91c4facac9cc1b7c2e497be77af636ac2b36138..bc85a155a6ca0e21ca1dcf737c015e9919748345 100644
2018-07-15 03:53:17 +02:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
2020-11-03 03:22:15 +01:00
@@ -1543,16 +1543,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2020-06-25 13:00:35 +02:00
return s;
}
2018-07-15 03:53:17 +02:00
2020-06-25 13:00:35 +02:00
- public String locale = "en_us"; // CraftBukkit - add, lowercase
2018-07-15 03:53:17 +02:00
+ public String locale = null; // CraftBukkit - lowercase // Paper - default to null
2020-06-25 13:00:35 +02:00
public void a(PacketPlayInSettings packetplayinsettings) {
// CraftBukkit start
if (getMainHand() != packetplayinsettings.getMainHand()) {
2018-07-15 03:53:17 +02:00
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
this.server.server.getPluginManager().callEvent(event);
}
2020-06-25 13:00:35 +02: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 03:53:17 +02:00
this.server.server.getPluginManager().callEvent(event);
2020-08-25 04:22:08 +02:00
+ new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.locale, packetplayinsettings.locale).callEvent(); // Paper
2018-07-15 03:53:17 +02:00
}
2020-06-26 03:58:00 +02:00
this.locale = packetplayinsettings.locale;
2018-12-08 11:09:55 +01:00
this.clientViewDistance = packetplayinsettings.viewDistance;
2018-07-15 03:53:17 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2020-11-19 16:15:16 +01:00
index 8f352763d81bb44786a603e80feb3a25ce91eb7a..f447059d0eecf68c44a74f27acd726f9355c4bd7 100644
2018-07-15 03:53:17 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2020-10-17 12:39:45 +02:00
@@ -1816,8 +1816,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2018-07-15 03:53:17 +02: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