49 lines
2.7 KiB
Diff
49 lines
2.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
index cda0e7f8f9a9d66ac4e5a3f52609a4271bf0c4b5..3f1f8f7fe9452f66b18a08ef480d50ef78ad3351 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
@@ -1695,7 +1695,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||
|
|
return s;
|
||
|
|
}
|
||
|
|
|
||
|
|
- public String locale = "en_us"; // CraftBukkit - add, lowercase
|
||
|
|
+ public String locale = null; // CraftBukkit - add, lowercase // Paper - default to null
|
||
|
|
public java.util.Locale adventure$locale = java.util.Locale.US; // Paper
|
||
|
|
public void a(PacketPlayInSettings packetplayinsettings) {
|
||
|
|
// CraftBukkit start
|
||
|
|
@@ -1703,9 +1703,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||
|
|
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
|
||
|
|
this.server.server.getPluginManager().callEvent(event);
|
||
|
|
}
|
||
|
|
- 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);
|
||
|
|
this.server.server.getPluginManager().callEvent(event);
|
||
|
|
+ new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.locale, packetplayinsettings.locale).callEvent(); // Paper
|
||
|
|
}
|
||
|
|
this.locale = packetplayinsettings.locale;
|
||
|
|
// Paper start
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
index 4bb57229c045956bab631982e12c0fc420db450e..5698ef90bfeceec37eaf7f23361246ef125b3cd1 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -1877,8 +1877,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
|
||
|
|
}
|
||
|
|
|
||
|
|
// Paper start
|