From b7a10b1e3e7897e6714b6ea5c72a6ba4687a3c74 Mon Sep 17 00:00:00 2001 From: zml Date: Sun, 5 Sep 2021 18:55:25 -0700 Subject: [PATCH] api: Don't override Pointered methods that just delegate This allows for easier overriding of these methods for forwarding audiences that have their own pointers/identity. --- .../adventure/audience/ForwardingAudience.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) 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 057ecd99f..8c1972db7 100644 --- a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java +++ b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java @@ -67,19 +67,8 @@ public interface ForwardingAudience extends Audience { @NotNull Iterable audiences(); @Override - default @NotNull Optional get(final @NotNull Pointer pointer) { - return Optional.empty(); // unsupported - } - - @Contract("_, null -> null; _, !null -> !null") - @Override - default @Nullable T getOrDefault(final @NotNull Pointer pointer, final @Nullable T defaultValue) { - return defaultValue; // unsupported - } - - @Override - default @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer pointer, final @NotNull Supplier defaultValue) { - return defaultValue.get(); // unsupported + default @NotNull Pointers pointers() { + return Pointers.empty(); // unsupported } @Override