Paper/Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch

76 lines
3.4 KiB
Diff
Raw Normal View History

2018-02-12 19:04:05 +01:00
From 3034ff4282f30c45b816c24e5764671fca4ab37a 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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
2018-02-12 19:04:05 +01:00
index e48121b4a..24d3b29a5 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
2017-05-31 10:04:52 +02:00
@@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
public class EntityPlayer extends EntityHuman implements ICrafting {
2017-05-21 06:41:39 +02:00
private static final Logger bV = LogManager.getLogger();
2017-05-31 10:04:52 +02:00
- public String locale = "en_us"; // CraftBukkit - lowercase
2017-05-28 06:25:17 +02:00
+ public String locale = null; // PAIL: private -> public // Paper - default to null
public PlayerConnection playerConnection;
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
2017-06-09 14:29:44 +02:00
@@ -1229,12 +1229,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2017-05-28 06:25:17 +02:00
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
2016-05-28 04:22:18 +02:00
this.server.server.getPluginManager().callEvent(event);
}
2017-05-28 06:25:17 +02:00
- if (!this.locale.equals(packetplayinsettings.a())) {
2016-05-28 04:22:18 +02:00
+
+ // 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;
2017-05-28 06:25:17 +02:00
+ this.locale = packetplayinsettings.a();
+ if (!this.locale.equals(oldLocale)) {
2016-05-12 04:07:46 +02:00
+ new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), oldLocale, this.locale).callEvent();
+ }
2017-05-28 06:25:17 +02:00
+
+ // Compat with Bukkit
+ oldLocale = oldLocale != null ? oldLocale : "en_us";
+ // Paper end
2017-05-28 06:25:17 +02:00
+
+ if (!oldLocale.equals(packetplayinsettings.a())) {
PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(getBukkitEntity(), packetplayinsettings.a());
this.server.server.getPluginManager().callEvent(event);
}
// CraftBukkit end
- this.locale = packetplayinsettings.a();
2017-05-21 06:41:39 +02:00
this.cl = packetplayinsettings.c();
this.cm = packetplayinsettings.d();
2017-05-14 20:05:01 +02:00
this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2018-02-12 19:04:05 +01:00
index 0eee46edd..98e9da59a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2018-02-12 19:04:05 +01:00
@@ -1633,8 +1633,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
}
public void setAffectsSpawning(boolean affects) {
2018-02-12 19:04:05 +01:00
@@ -1771,7 +1773,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale()
{
- return getHandle().locale;
+ return CraftPlayer.this.getLocale(); // Paper
}
@Override
--
2018-02-12 19:04:05 +01:00
2.16.1