2023-09-21 21:54:46 +02:00
|
|
|
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
|
2023-09-23 01:42:59 +02:00
|
|
|
index 10a99aff9632db578d19683675ba12242ae6970b..77668e9534f6d68755020cbae09aae5d47d10fa1 100644
|
2023-09-21 21:54:46 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
|
@@ -214,7 +214,7 @@ public class ServerPlayer extends Player {
|
|
|
|
|
private int levitationStartTime;
|
|
|
|
|
private boolean disconnected;
|
|
|
|
|
private int requestedViewDistance;
|
|
|
|
|
- public String language = "en_us"; // CraftBukkit - default
|
|
|
|
|
+ public String language = null; // CraftBukkit - default // Paper - default to null
|
|
|
|
|
public java.util.Locale adventure$locale = java.util.Locale.US; // Paper
|
|
|
|
|
@Nullable
|
|
|
|
|
private Vec3 startingToFallPosition;
|
2023-09-22 22:13:57 +02:00
|
|
|
@@ -308,7 +308,7 @@ public class ServerPlayer extends Player {
|
2023-09-21 21:54:46 +02:00
|
|
|
this.lastActionTime = Util.getMillis();
|
|
|
|
|
this.recipeBook = new ServerRecipeBook();
|
|
|
|
|
this.requestedViewDistance = 2;
|
|
|
|
|
- this.language = "en_us";
|
|
|
|
|
+ this.language = null; // Paper - default to null
|
|
|
|
|
this.lastSectionPos = SectionPos.of(0, 0, 0);
|
|
|
|
|
this.chunkTrackingView = ChunkTrackingView.EMPTY;
|
|
|
|
|
this.respawnDimension = Level.OVERWORLD;
|
2023-09-22 22:13:57 +02:00
|
|
|
@@ -1862,9 +1862,10 @@ public class ServerPlayer extends Player {
|
2023-09-21 21:54:46 +02:00
|
|
|
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
|
|
|
|
|
this.server.server.getPluginManager().callEvent(event);
|
|
|
|
|
}
|
|
|
|
|
- if (!this.language.equals(clientOptions.language())) {
|
|
|
|
|
+ if (this.language == null || !this.language.equals(clientOptions.language())) { // Paper
|
|
|
|
|
PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(this.getBukkitEntity(), clientOptions.language());
|
|
|
|
|
this.server.server.getPluginManager().callEvent(event);
|
|
|
|
|
+ this.server.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.language, clientOptions.language())); // Paper
|
|
|
|
|
}
|
|
|
|
|
// CraftBukkit end
|
|
|
|
|
this.language = clientOptions.language();
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2023-09-22 22:13:57 +02:00
|
|
|
index 248b424939740e1d9208398c2c649efce0c99cf9..b8fc211d72e860c85ca39b03574db3a7b18e369f 100644
|
2023-09-21 21:54:46 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2023-09-22 22:13:57 +02:00
|
|
|
@@ -2245,7 +2245,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2023-09-21 21:54:46 +02:00
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public String getLocale() {
|
|
|
|
|
- return this.getHandle().language;
|
|
|
|
|
+ // Paper start - Locale change event
|
|
|
|
|
+ final String locale = this.getHandle().language;
|
|
|
|
|
+ return locale != null ? locale : "en_us";
|
|
|
|
|
+ // Paper end
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Paper start
|
