mirror of https://github.com/PaperMC/Paper.git
49 lines
2.6 KiB
Diff
49 lines
2.6 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/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
index 54dc00f521e7f7b4cb86b2653ac1d0058dcbb03b..0590fb50330b5387a25e7fc7139e04586999efc6 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
@@ -1763,7 +1763,7 @@ public class ServerPlayer extends Player {
|
||
|
|
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 updateOptions(ServerboundClientInformationPacket packet) {
|
||
|
|
// CraftBukkit start
|
||
|
|
@@ -1771,9 +1771,10 @@ public class ServerPlayer extends Player {
|
||
|
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
|
||
|
|
this.server.server.getPluginManager().callEvent(event);
|
||
|
|
}
|
||
|
|
- if (!this.locale.equals(packet.language)) {
|
||
|
|
+ if (this.locale == null || !this.locale.equals(packet.language)) { // Paper - check for null
|
||
|
|
PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(this.getBukkitEntity(), packet.language);
|
||
|
|
this.server.server.getPluginManager().callEvent(event);
|
||
|
+ this.server.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.locale, packet.language)); // Paper
|
||
|
|
}
|
||
|
|
this.locale = packet.language;
|
||
|
|
// 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 8e6e7c5960b9273e816d7275b8a3058024190f5a..3be63b51511fd12f295e1f07549f281246ee2dc0 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -2084,8 +2084,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public String getLocale() {
|
||
|
|
- return this.getHandle().locale;
|
||
|
|
-
|
||
|
|
+ // Paper start - Locale change event
|
||
|
|
+ final String locale = this.getHandle().locale;
|
||
|
|
+ return locale != null ? locale : "en_us";
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
|
||
|
|
// Paper start
|