From 540e39b70479b87d048392fbe413ec9a96dd278a Mon Sep 17 00:00:00 2001
From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
Date: Mon, 7 Jun 2021 09:30:15 +0100
Subject: [PATCH] Self emitter changes, javadoc changes

---
 .../main/java/net/kyori/adventure/audience/Audience.java   | 4 ++--
 api/src/main/java/net/kyori/adventure/sound/Sound.java     | 2 +-
 api/src/main/java/net/kyori/adventure/sound/SoundImpl.java | 7 ++++++-
 3 files changed, 9 insertions(+), 4 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 f37a40d35..0b46dcaa9 100644
--- a/api/src/main/java/net/kyori/adventure/audience/Audience.java
+++ b/api/src/main/java/net/kyori/adventure/audience/Audience.java
@@ -476,12 +476,12 @@ default void playSound(final @NotNull Sound sound, final double x, final double
    *   In this case the sound will be played at the location of the emitter and will not follow them.
    * </p>
    *
+   * <p>To play a sound that follows the recipient, use {@link Sound.Emitter#self()}.</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
-   * @see Sound.Emitter
    * @since 4.8.0
    */
   default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter 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 f3ba7891b..cd3013926 100644
--- a/api/src/main/java/net/kyori/adventure/sound/Sound.java
+++ b/api/src/main/java/net/kyori/adventure/sound/Sound.java
@@ -263,7 +263,7 @@ interface Emitter {
      * @since 4.8.0
      */
     static @NotNull Emitter self() {
-      return SoundImpl.SELF;
+      return SoundImpl.EMITTER_SELF;
     }
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java b/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java
index 59a698433..69fa95dd7 100644
--- a/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java
+++ b/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java
@@ -31,7 +31,12 @@
 import org.jetbrains.annotations.Nullable;
 
 abstract class SoundImpl implements Sound {
-  static final Emitter SELF = new Emitter() {};
+  static final Emitter EMITTER_SELF = new Emitter() {
+    @Override
+    public String toString() {
+      return "SelfSoundEmitter";
+    }
+  };
 
   private final Source source;
   private final float volume;