From b3f0482fdc8123a24cef8879dbb65bdd542e7dbb Mon Sep 17 00:00:00 2001
From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
Date: Fri, 4 Jun 2021 14:50:46 +0100
Subject: [PATCH] Fix formatting, clarify javadocs

---
 .../main/java/net/kyori/adventure/audience/Audience.java | 9 ++++++++-
 .../net/kyori/adventure/audience/ForwardingAudience.java | 4 ++--
 api/src/main/java/net/kyori/adventure/sound/Sound.java   | 1 +
 3 files changed, 11 insertions(+), 3 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
index 2af2d7855b..ed93f4c656 100644
--- a/api/src/main/java/net/kyori/adventure/audience/Audience.java
+++ b/api/src/main/java/net/kyori/adventure/audience/Audience.java
@@ -469,12 +469,19 @@ default void playSound(final @NotNull Sound sound, final double x, final double
   /**
    * Plays a sound from an emitter, usually an entity.
    *
+   * <p>
+   *   Sounds played from an emitter will follow the entity unless the sound is custom sound.
+   *   In the case where a custom sound is provided, the sound will be played at the location of the emitter at the time of calling.
+   * </p>
+   *
+   * <p><b>Note</b>: Due to <a href="https://bugs.mojang.com/browse/MC-138832">MC-138832</a>, the volume and pitch may be ignored when using this method.</p>
+   *
    * @param sound a sound
    * @param emitter an emitter
    * @see Sound
    * @since 4.8.0
    */
-  default void playSound(final @NonNull Sound sound, final Sound.@NonNull Emitter emitter) {
+  default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter emitter) {
   }
 
   /**
diff --git a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java
index 6da39568bd..46e4b69be4 100644
--- a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java
+++ b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java
@@ -144,7 +144,7 @@ default void playSound(final @NotNull Sound sound, final double x, final double
 
   @Override
   default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter emitter) {
-    for(final Audience audience : this.audiences()) audience.playSound(sound, emitter);
+    for (final Audience audience : this.audiences()) audience.playSound(sound, emitter);
   }
 
   @Override
@@ -266,7 +266,7 @@ default void playSound(final @NotNull Sound sound, final double x, final double
     }
 
     @Override
-    default void playSound(final @NonNull Sound sound, final Sound.@NonNull Emitter emitter) {
+    default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter emitter) {
       this.audience().playSound(sound, emitter);
     }
 
diff --git a/api/src/main/java/net/kyori/adventure/sound/Sound.java b/api/src/main/java/net/kyori/adventure/sound/Sound.java
index 3f4a7c6e30..f41350ff18 100644
--- a/api/src/main/java/net/kyori/adventure/sound/Sound.java
+++ b/api/src/main/java/net/kyori/adventure/sound/Sound.java
@@ -250,6 +250,7 @@ interface Type extends Keyed {
   /**
    * An emitter of sounds.
    *
+   * @see net.kyori.adventure.audience.Audience#playSound(Sound, Emitter)
    * @since 4.8.0
    */
   interface Emitter {