MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Switch to #pointers

Browse Source 
Ensures that Pointered#getOrDefault[From] works
This commit is contained in:
lexikiq
2021-06-11 21:12:44 -04:00
parent 069796a2f2
commit 3c4312056b
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/main/java/com/velocitypowered/api/command/CommandSource.java
View File

@@ -16,6 +16,7 @@ import net.kyori.adventure.identity.Identified;
import net.kyori.adventure.identity.Identity; import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.permission.PermissionChecker; import net.kyori.adventure.permission.PermissionChecker;
import net.kyori.adventure.pointer.Pointer; import net.kyori.adventure.pointer.Pointer;
import net.kyori.adventure.pointer.Pointers;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.legacytext3.LegacyText3ComponentSerializer; import net.kyori.adventure.text.serializer.legacytext3.LegacyText3ComponentSerializer;
import net.kyori.adventure.util.TriState; import net.kyori.adventure.util.TriState;
@@ -44,12 +45,8 @@ public interface CommandSource extends Audience, PermissionSubject, PermissionCh
} }
@Override @Override
@SuppressWarnings("unchecked") // safe casts default @NotNull Pointers pointers() {
default @NotNull <T> Optional<T> get(final @NotNull Pointer<T> pointer) { return Pointers.builder().withStatic(PermissionChecker.POINTER, this).build();
if (pointer == PermissionChecker.POINTER) {
return Optional.of((T) this);
}
return Audience.super.get(pointer);
} }
@Override @Override

18
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
View File

@@ -96,6 +96,7 @@ import net.kyori.adventure.bossbar.BossBar;
import net.kyori.adventure.identity.Identity; import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.permission.PermissionChecker; import net.kyori.adventure.permission.PermissionChecker;
import net.kyori.adventure.pointer.Pointer; import net.kyori.adventure.pointer.Pointer;
import net.kyori.adventure.pointer.Pointers;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.TranslatableComponent;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
@@ -108,6 +109,7 @@ import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
import org.jetbrains.annotations.NotNull;
public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
@@ -279,16 +281,12 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
} }
@Override @Override
@SuppressWarnings("unchecked") // safe casts public @NotNull Pointers pointers() {
public <T> Optional<T> get(final Pointer<T> pointer) { return Player.super.pointers().toBuilder()
if (pointer == Identity.UUID) { .withDynamic(Identity.UUID, this::getUniqueId)
return Optional.of((T) this.getUniqueId()); .withDynamic(Identity.NAME, this::getUsername)
} else if (pointer == Identity.NAME) { .withDynamic(Identity.DISPLAY_NAME, this::asComponent)
return Optional.of((T) this.getGameProfile().getName()); .build();
} else if (pointer == Identity.DISPLAY_NAME) {
return Optional.of((T) asComponent());
}
return Player.super.get(pointer);
} }
@Override @Override