diff options
| author | Lulu13022002 <[email protected]> | 2024-11-29 17:12:17 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-11-29 17:12:17 +0100 |
| commit | 47f207135044e8835c529561d0d0029f0ae3fba8 (patch) | |
| tree | 9f4e40b568d0c5b5f65b8e79ecb56834bef89f15 | |
| parent | 5ab678947fb620ff123865fc249831f68ff4d35d (diff) | |
| download | Paper-47f207135044e8835c529561d0d0029f0ae3fba8.tar.gz Paper-47f207135044e8835c529561d0d0029f0ae3fba8.zip | |
Deprecate ChatVisibility#UNKNOWN (#11683)
| -rw-r--r-- | patches/api/0183-Add-Player-Client-Options-API.patch | 10 | ||||
| -rw-r--r-- | patches/server/0336-Implement-Player-Client-Options-API.patch | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/patches/api/0183-Add-Player-Client-Options-API.patch b/patches/api/0183-Add-Player-Client-Options-API.patch index 94a094608b..02cbc4e48c 100644 --- a/patches/api/0183-Add-Player-Client-Options-API.patch +++ b/patches/api/0183-Add-Player-Client-Options-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add Player Client Options API diff --git a/src/main/java/com/destroystokyo/paper/ClientOption.java b/src/main/java/com/destroystokyo/paper/ClientOption.java new file mode 100644 -index 0000000000000000000000000000000000000000..7af28d6ba27c97a87ffbb9db03a5c340277853cc +index 0000000000000000000000000000000000000000..290bde7050f43cb5cd6c0cea9eb7a05297536dec --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ClientOption.java -@@ -0,0 +1,70 @@ +@@ -0,0 +1,76 @@ +package com.destroystokyo.paper; + +import net.kyori.adventure.translation.Translatable; @@ -44,6 +44,12 @@ index 0000000000000000000000000000000000000000..7af28d6ba27c97a87ffbb9db03a5c340 + FULL("full"), + SYSTEM("system"), + HIDDEN("hidden"), ++ /** ++ * @deprecated no longer used anymore since 1.15.2, the value fallback ++ * to the default value of the setting when unknown on the server. ++ * In this case {@link #FULL} will be returned. ++ */ ++ @Deprecated(since = "1.15.2", forRemoval = true) + UNKNOWN("unknown"); + + public static final Index<String, ChatVisibility> NAMES = Index.create(ChatVisibility.class, chatVisibility -> chatVisibility.name); diff --git a/patches/server/0336-Implement-Player-Client-Options-API.patch b/patches/server/0336-Implement-Player-Client-Options-API.patch index 96ad445461..c86f538e70 100644 --- a/patches/server/0336-Implement-Player-Client-Options-API.patch +++ b/patches/server/0336-Implement-Player-Client-Options-API.patch @@ -133,7 +133,7 @@ index 0c68c0a9ec9b353b353eff0c36af2993df5f59b3..eebf44c7124c4f48b6d48562a00633b1 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 b3b13f1baea0b170fd4f1546689aad40f53d3c27..8cfcd8797d056be07b09ec9627bc35bf75eb0d2d 100644 +index b3b13f1baea0b170fd4f1546689aad40f53d3c27..59e291d7552e20b960faa7d679cf69981458c139 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -658,6 +658,30 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -148,7 +148,7 @@ index b3b13f1baea0b170fd4f1546689aad40f53d3c27..8cfcd8797d056be07b09ec9627bc35bf + } else if (com.destroystokyo.paper.ClientOption.CHAT_COLORS_ENABLED == type) { + return type.getType().cast(this.getHandle().canChatInColor()); + } else if (com.destroystokyo.paper.ClientOption.CHAT_VISIBILITY == type) { -+ return type.getType().cast(this.getHandle().getChatVisibility() == null ? com.destroystokyo.paper.ClientOption.ChatVisibility.UNKNOWN : com.destroystokyo.paper.ClientOption.ChatVisibility.valueOf(this.getHandle().getChatVisibility().name())); ++ return type.getType().cast(com.destroystokyo.paper.ClientOption.ChatVisibility.valueOf(this.getHandle().getChatVisibility().name())); + } else if (com.destroystokyo.paper.ClientOption.LOCALE == type) { + return type.getType().cast(this.getLocale()); + } else if (com.destroystokyo.paper.ClientOption.MAIN_HAND == type) { |