Update upstream

This commit is contained in:
Owen1212055 2024-04-23 19:31:55 -04:00
parent 487555b627
commit 0225537fd1
No known key found for this signature in database
GPG key ID: 2133292072886A30
18 changed files with 59 additions and 59 deletions

View file

@ -39,10 +39,10 @@ index d75c3c10dcbd777796e479b9538e5254857ac07c..ab2336a30c1ffc1698c327c031a648d4
// 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 6f4d287d8a6992af475e8c94f4316d091d76f921..b1693486297b463c92ce02663aa1727d7d4cabe3 100644
index 63d00413d331cd012bac151052a579355d46c690..07bfb5014d82262b0c96fc0c8cf52bfa0f67add1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2406,7 +2406,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2407,7 +2407,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {