Paper/patches/server/0049-Implement-PlayerLocaleChangeEvent.patch

57 lines
3.2 KiB
Diff
Raw Normal View History

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
2024-06-13 19:12:48 +02:00
index 2022667e631d0ae1c7e7ffcfeca81091aa7c57c7..de55fbbc92d180ca49427b134e6fc8e20f52607c 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
2024-06-13 19:12:48 +02:00
@@ -236,7 +236,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
2023-09-21 21:54:46 +02:00
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;
2024-06-13 19:12:48 +02:00
@@ -293,7 +293,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.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;
2024-06-13 19:12:48 +02:00
@@ -2054,9 +2054,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
2023-10-27 01:34:58 +02:00
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), this.getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
2023-09-21 21:54:46 +02:00
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
2024-06-14 14:11:52 +02:00
index a9df824ae0a28256f3469e085c891a3a2af0fd30..4079cf3d515718a18b41333fbdc96d0c8f56648a 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
2024-06-13 19:12:48 +02:00
@@ -2422,7 +2422,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