zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

Fix EntitySelectorWrapper annotations

Browse source
This commit is contained in:
Jason Penilla 2022-10-26 10:58:34 -07:00 • committed by Jason
parent 2f34437398
commit f92f26f6df
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorUtils.java
View file

@ -57,6 +57,7 @@ import org.bukkit.NamespacedKey;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
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.checkerframework.framework.qual.DefaultQualifier; import org.checkerframework.framework.qual.DefaultQualifier;
@ -294,17 +295,17 @@ final class SelectorUtils {
} }
static final class EntitySelectorWrapper { static final class EntitySelectorWrapper {
private static volatile @Nullable Methods methods; private static volatile @MonotonicNonNull Methods methods;
private final CommandContext<?> commandContext; private final CommandContext<?> commandContext;
private final Object selector; private final Object selector;
private static final class Methods { private static final class Methods {
private Method getBukkitEntity; private @MonotonicNonNull Method getBukkitEntity;
private Method entity; private @MonotonicNonNull Method entity;
private Method player; private @MonotonicNonNull Method player;
private Method entities; private @MonotonicNonNull Method entities;
private Method players; private @MonotonicNonNull Method players;
Methods(final CommandContext<?> commandContext, final Object selector) { Methods(final CommandContext<?> commandContext, final Object selector) {
final Object nativeSender = commandContext.get(WrappedBrigadierParser.COMMAND_CONTEXT_BRIGADIER_NATIVE_SENDER); final Object nativeSender = commandContext.get(WrappedBrigadierParser.COMMAND_CONTEXT_BRIGADIER_NATIVE_SENDER);
@ -360,11 +361,11 @@ final class SelectorUtils {
} }
} }
} }
Objects.requireNonNull(this.getBukkitEntity); Objects.requireNonNull(this.getBukkitEntity, "Failed to locate getBukkitEntity method");
Objects.requireNonNull(this.player); Objects.requireNonNull(this.player, "Failed to locate findPlayer method");
Objects.requireNonNull(this.entity); Objects.requireNonNull(this.entity, "Failed to locate findEntity method");
Objects.requireNonNull(this.players); Objects.requireNonNull(this.players, "Failed to locate findPlayers method");
Objects.requireNonNull(this.entities); Objects.requireNonNull(this.entities, "Failed to locate findEntities method");
} }
private static @Nullable Method findGetBukkitEntityMethod(final Class<?> returnType) { private static @Nullable Method findGetBukkitEntityMethod(final Class<?> returnType) {