mirror of https://github.com/PaperMC/Paper.git
57 lines
3.1 KiB
Diff
57 lines
3.1 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 d75c3c10dcbd777796e479b9538e5254857ac07c..ab2336a30c1ffc1698c327c031a648d4121c116e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
@@ -232,7 +232,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;
|
||
|
|
@@ -288,7 +288,7 @@ public class ServerPlayer extends Player {
|
||
|
|
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;
|
||
|
|
@@ -2002,9 +2002,10 @@ public class ServerPlayer extends Player {
|
||
|
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), this.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
|
||
|
index adf76abd693d8cfba76a18d46fcd672fecd52f7e..a7ccce7b5036eb0602e6030be6fbaa9f032f78c2 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
@@ -2403,7 +2403,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
|
||
|
|
@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
|