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-06-28 08:21:40 +00:00
|
|
|
index e140009e73517feea5f2c9923091a3d528e801af..177f865688c40d0ecca72771007e2271626ab5cc 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-06-28 08:21:40 +00:00
|
|
|
@@ -1570,20 +1570,28 @@ 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-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
|
|
|
// CraftBukkit end
|
|
|
|
+ // Paper start - add PlayerLocaleChangeEvent
|
|
|
|
+ // Since the field is initialized to null, this event should always fire the first time the packet is received
|
|
|
|
+ String oldLocale = this.locale;
|
2020-06-25 11:00:35 +00:00
|
|
|
+ this.locale = packetplayinsettings.locale;
|
2018-07-15 01:53:17 +00:00
|
|
|
+ if (!this.locale.equals(oldLocale)) {
|
|
|
|
+ new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), oldLocale, this.locale).callEvent();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2020-06-25 11:00:35 +00:00
|
|
|
this.cf = packetplayinsettings.d();
|
|
|
|
this.cg = packetplayinsettings.e();
|
|
|
|
this.getDataWatcher().set(EntityPlayer.bp, (byte) packetplayinsettings.f());
|
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-06-27 21:37:09 +00:00
|
|
|
index 41a73db6040af29c9e087ac2ca425f5d28d0142a..43b50d56f87a1ac52eae1529875834ab85733aa4 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-06-26 16:20:03 +00:00
|
|
|
@@ -1776,8 +1776,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
|