fix: Remove unintended forwarding audience override annotation remova…

…l and fix deprecation message inconsistency
KyoriPowered · Jun 27, 2022 · 5c40e04 · 5c40e04
1 parent ad71eb0
commit 5c40e04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/api/src/main/java/net/kyori/adventure/audience/Audience.java b/api/src/main/java/net/kyori/adventure/audience/Audience.java
@@ -200,7 +200,7 @@ default void sendMessage(final @NotNull ComponentLike message) {
    * @param message a message
    * @see Component
    * @since 4.0.0
-   * @deprecated since 4.12.0, client errors and can reject identified messages without {@link SignedMessage} data, this may be unsupported in the future, use {@link #sendMessage(ComponentLike, SignedMessage, PlayerIdentified)} instead
+   * @deprecated since 4.12.0, the client errors on and can reject identified messages without {@link SignedMessage} data, this may be unsupported in the future, use {@link #sendMessage(ComponentLike, SignedMessage, PlayerIdentified)} instead
    */
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
@@ -215,7 +215,7 @@ default void sendMessage(final @NotNull Identified source, final @NotNull Compon
    * @param message a message
    * @see Component
    * @since 4.0.0
-   * @deprecated since 4.12.0, client errors and can reject identified messages without {@link SignedMessage} data, this may be unsupported in the future, use {@link #sendMessage(ComponentLike, SignedMessage, PlayerIdentified)} instead
+   * @deprecated since 4.12.0, the client errors on and can reject identified messages without {@link SignedMessage} data, this may be unsupported in the future, use {@link #sendMessage(ComponentLike, SignedMessage, PlayerIdentified)} instead
    */
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
@@ -247,6 +247,7 @@ default void sendMessage(final @NotNull Component message) {
    * @deprecated since 4.12.0, the client errors on receiving and can reject identified messages without {@link SignedMessage} data, this may be unsupported in the future, use {@link #sendMessage(Component, SignedMessage, PlayerIdentified)} instead
    */
   @Deprecated
+  @ForwardingAudienceOverrideNotRequired
   default void sendMessage(final @NotNull Identified source, final @NotNull Component message) {
     this.sendMessage(source, message, MessageType.SYSTEM);
   }

diff --git a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java
@@ -99,11 +99,6 @@ default void forEachAudience(final @NotNull Consumer<? super Audience> action) {
     for (final Audience audience : this.audiences()) audience.forEachAudience(action);
   }
 
-  @Override
-  default void sendMessage(final @NotNull Identified source, final @NotNull Component message) {
-    for (final Audience audience : this.audiences()) audience.sendMessage(source, message);
-  }
-
   @Override
   default void sendMessage(final @NotNull Component message, final @NotNull ChatType chatType) {
     for (final Audience audience : this.audiences()) audience.sendMessage(message, chatType);
@@ -260,11 +255,6 @@ default void forEachAudience(final @NotNull Consumer<? super Audience> action) {
       return this.audience().pointers();
     }
 
-    @Override
-    default void sendMessage(final @NotNull Identified source, final @NotNull Component message) {
-      this.audience().sendMessage(source, message);
-    }
-
     @Override
     default void sendMessage(final @NotNull Component message, final @NotNull ChatType chatType) {
       this.audience().sendMessage(message, chatType);