mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix NotNull locales (#10216)

Browse source 
Two methods returning locales are annotated @NotNull, despite being able
to return null
This commit is contained in:
Moulberry 2024-02-10 04:30:50 +08:00
parent 4f9f09bb9b
commit 6591c39509
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
patches/server/Implement-Player-Client-Options-API.patch
View file

@ -133,7 +133,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public void updateOptionsNoEvents(ClientInformation clientOptions) {
+ // Paper end
this.language = clientOptions.language();
this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(this.language); // Paper
this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper
this.requestedViewDistance = clientOptions.viewDistance();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644