Project wide syntax/annotation cleanup (#4238)

Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
2024-08-14 23:57:35 +00:00 · 2023-12-06 00:54:42 +01:00 · 2023-12-06 00:54:42 +01:00 · 95d65350e4
commit 95d65350e4
parent 998caee156
270 changed files with 891 additions and 977 deletions
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperPingPassthrough.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperPingPassthrough.java
@ -28,11 +28,11 @@ package org.geysermc.geyser.platform.spigot;
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
 import com.destroystokyo.paper.network.StatusClient;
 import org.bukkit.Bukkit;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.ping.GeyserPingInfo;
 import org.geysermc.geyser.ping.IGeyserPingPassthrough;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;

 import java.lang.reflect.Constructor;
 import java.net.InetSocketAddress;
@ -50,6 +50,7 @@ public final class GeyserPaperPingPassthrough implements IGeyserPingPassthrough
        this.logger = logger;
    }

+    @SuppressWarnings("deprecation")
    @Nullable
    @Override
    public GeyserPingInfo getPingInformation(InetSocketAddress inetSocketAddress) {
@ -89,7 +90,7 @@ public final class GeyserPaperPingPassthrough implements IGeyserPingPassthrough

    private record GeyserStatusClient(InetSocketAddress address) implements StatusClient {
        @Override
-        public @NotNull InetSocketAddress getAddress() {
+        public @NonNull InetSocketAddress getAddress() {
            return address;
        }

--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotCompressionDisabler.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotCompressionDisabler.java
@ -34,7 +34,7 @@ import org.geysermc.geyser.GeyserImpl;
 /**
 * Disables the compression packet (and the compression handlers from being added to the pipeline) for Geyser clients
 * that won't be receiving the data over the network.
- *
+ * <p>
 * As of 1.8 - 1.17.1, compression is enabled in the Netty pipeline by adding a listener after a packet is written.
 * If we simply "cancel" or don't forward the packet, then the listener is never called.
 */
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java
@ -47,6 +47,7 @@ public class GeyserSpigotDumpInfo extends BootstrapDumpInfo {
    private final int serverPort;
    private final List<PluginInfo> plugins;

+    @SuppressWarnings("deprecation")
    GeyserSpigotDumpInfo() {
        super();
        this.platformName = Bukkit.getName();
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
@ -32,6 +32,7 @@ import io.netty.channel.*;
 import io.netty.channel.local.LocalAddress;
 import io.netty.util.concurrent.DefaultThreadFactory;
 import org.bukkit.Bukkit;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.GeyserBootstrap;
 import org.geysermc.geyser.network.netty.GeyserInjector;
 import org.geysermc.geyser.network.netty.LocalServerChannelWrapper;
@ -74,12 +75,10 @@ public class GeyserSpigotInjector extends GeyserInjector {
        Object connection = null;
        // Find the class that manages network IO
        for (Method m : serverClazz.getDeclaredMethods()) {
-            if (m.getReturnType() != null) {
-                // First is Spigot-mapped name, second is Mojang-mapped name which is implemented as future-proofing
-                if (m.getReturnType().getSimpleName().equals("ServerConnection") || m.getReturnType().getSimpleName().equals("ServerConnectionListener")) {
-                    if (m.getParameterTypes().length == 0) {
-                        connection = m.invoke(server);
-                    }
+            // First is Spigot-mapped name, second is Mojang-mapped name which is implemented as future-proofing
+            if (m.getReturnType().getSimpleName().equals("ServerConnection") || m.getReturnType().getSimpleName().equals("ServerConnectionListener")) {
+                if (m.getParameterTypes().length == 0) {
+                    connection = m.invoke(server);
                }
            }
        }
@ -117,7 +116,7 @@ public class GeyserSpigotInjector extends GeyserInjector {
                .channel(LocalServerChannelWrapper.class)
                .childHandler(new ChannelInitializer<>() {
                    @Override
-                    protected void initChannel(Channel ch) throws Exception {
+                    protected void initChannel(@NonNull Channel ch) throws Exception {
                        initChannel.invoke(childHandler, ch);

                        if (bootstrap.getGeyserConfig().isDisableCompression() && GeyserSpigotCompressionDisabler.ENABLED) {
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java
@ -30,10 +30,12 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.server.ServerListPingEvent;
 import org.bukkit.util.CachedServerIcon;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.ping.GeyserPingInfo;
 import org.geysermc.geyser.ping.IGeyserPingPassthrough;

-import javax.annotation.Nonnull;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.Collections;
@ -44,8 +46,9 @@ public class GeyserSpigotPingPassthrough implements IGeyserPingPassthrough {

    private final GeyserSpigotLogger logger;

+    @SuppressWarnings("deprecation")
    @Override
-    public GeyserPingInfo getPingInformation(InetSocketAddress inetSocketAddress) {
+    public @Nullable GeyserPingInfo getPingInformation(InetSocketAddress inetSocketAddress) {
        try {
            ServerListPingEvent event = new GeyserPingEvent(inetSocketAddress.getAddress(), Bukkit.getMotd(), Bukkit.getOnlinePlayers().size(), Bukkit.getMaxPlayers());
            Bukkit.getPluginManager().callEvent(event);
@ -67,7 +70,7 @@ public class GeyserSpigotPingPassthrough implements IGeyserPingPassthrough {
        public void setServerIcon(CachedServerIcon icon) throws IllegalArgumentException, UnsupportedOperationException {
        }

-        @Nonnull
+        @NonNull
        @Override
        public Iterator<Player> iterator() throws UnsupportedOperationException {
            return Collections.emptyIterator();
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
@ -42,13 +42,14 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.geysermc.geyser.api.util.PlatformType;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserBootstrap;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.adapters.spigot.SpigotAdapters;
 import org.geysermc.geyser.api.command.Command;
 import org.geysermc.geyser.api.extension.Extension;
+import org.geysermc.geyser.api.util.PlatformType;
 import org.geysermc.geyser.command.GeyserCommandManager;
 import org.geysermc.geyser.configuration.GeyserConfiguration;
 import org.geysermc.geyser.dump.BootstrapDumpInfo;
@ -66,7 +67,6 @@ import org.geysermc.geyser.platform.spigot.world.manager.GeyserSpigotNativeWorld
 import org.geysermc.geyser.platform.spigot.world.manager.GeyserSpigotWorldManager;
 import org.geysermc.geyser.text.GeyserLocale;
 import org.geysermc.geyser.util.FileUtils;
-import org.jetbrains.annotations.NotNull;

 import java.io.File;
 import java.io.IOException;
@ -76,6 +76,7 @@ import java.net.SocketAddress;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.logging.Level;

@ -137,6 +138,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
        // This is manually done instead of using Bukkit methods to save the config because otherwise comments get removed
        try {
            if (!getDataFolder().exists()) {
+                //noinspection ResultOfMethodCallIgnored
                getDataFolder().mkdir();
            }
            File configFile = FileUtils.fileOrCopiedFromResource(new File(getDataFolder(), "config.yml"), "config.yml",
@ -272,6 +274,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
        }

        PluginCommand geyserCommand = this.getCommand("geyser");
+        Objects.requireNonNull(geyserCommand, "base command cannot be null");
        geyserCommand.setExecutor(new GeyserSpigotCommandExecutor(geyser, geyserCommandManager.getCommands()));

        for (Map.Entry<Extension, Map<String, Command>> entry : this.geyserCommandManager.extensionCommands().entrySet()) {
@ -437,7 +440,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
        return false;
    }

-    @NotNull
+    @NonNull
    @Override
    public String getServerBindAddress() {
        return Bukkit.getIp();
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotVersionChecker.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotVersionChecker.java
@ -39,6 +39,7 @@ import java.lang.reflect.Modifier;
 public final class GeyserSpigotVersionChecker {
    private static final String VIAVERSION_DOWNLOAD_URL = "https://ci.viaversion.com/job/ViaVersion/";

+    @SuppressWarnings("deprecation")
    public static void checkForSupportedProtocol(GeyserLogger logger, boolean viaversion) {
        if (viaversion) {
            checkViaVersionSupportedVersions(logger);
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/PaperAdventure.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/PaperAdventure.java
@ -28,8 +28,8 @@ package org.geysermc.geyser.platform.spigot;
 import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.geyser.GeyserImpl;
-import org.jetbrains.annotations.Nullable;

 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@ -39,8 +39,8 @@ import java.lang.reflect.Method;

 /**
 * Utility class for converting our shaded Adventure into the Adventure bundled in Paper.
- *
- * Code mostly taken from https://github.com/KyoriPowered/adventure-platform/blob/94d5821f2e755170f42bd8a5fe1d5bf6f66d04ad/platform-bukkit/src/main/java/net/kyori/adventure/platform/bukkit/PaperFacet.java#L46
+ * <p>
+ * Code mostly taken from <a href="https://github.com/KyoriPowered/adventure-platform/blob/94d5821f2e755170f42bd8a5fe1d5bf6f66d04ad/platform-bukkit/src/main/java/net/kyori/adventure/platform/bukkit/PaperFacet.java#L46">here</a>
 * and the MinecraftReflection class.
 */
 public final class PaperAdventure {
@ -102,7 +102,7 @@ public final class PaperAdventure {
        SEND_MESSAGE_COMPONENT = playerComponentSendMessage;
    }

-    public static Object toNativeComponent(final Component component) {
+    public static @Nullable Object toNativeComponent(final Component component) {
        if (NATIVE_GSON_COMPONENT_SERIALIZER_DESERIALIZE_METHOD_BOUND == null) {
            GeyserImpl.getInstance().getLogger().error("Illegal state where Component serialization was called when it wasn't available!");
            return null;
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/ReflectedNames.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/ReflectedNames.java
@ -29,8 +29,8 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
 import com.destroystokyo.paper.network.StatusClient;
 import org.bukkit.event.server.ServerListPingEvent;
 import org.bukkit.util.CachedServerIcon;
+import org.checkerframework.checker.nullness.qual.Nullable;

-import javax.annotation.Nullable;
 import java.lang.reflect.Constructor;
 import java.net.InetAddress;

@ -40,15 +40,8 @@ import java.net.InetAddress;
 public final class ReflectedNames {

    static boolean checkPaperPingEvent() {
-        return classExists("com.destroystokyo.paper.event.server.PaperServerListPingEvent");
-    }
-
-    /**
-     * @return if this class name exists
-     */
-    private static boolean classExists(String clazz) {
        try {
-            Class.forName(clazz);
+            Class.forName("com.destroystokyo.paper.event.server.PaperServerListPingEvent");
            return true;
        } catch (ClassNotFoundException e) {
            return false;
@ -59,7 +52,7 @@ public final class ReflectedNames {
        return getConstructor(ServerListPingEvent.class, InetAddress.class, String.class, boolean.class, int.class, int.class) != null;
    }

-    static Constructor<PaperServerListPingEvent> getOldPaperPingConstructor() {
+    static @Nullable Constructor<PaperServerListPingEvent> getOldPaperPingConstructor() {
        if (getConstructor(PaperServerListPingEvent.class, StatusClient.class, String.class, int.class,
                int.class, String.class, int.class, CachedServerIcon.class) != null) {
            // @NotNull StatusClient client, @NotNull String motd, int numPlayers, int maxPlayers,
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserPaperCommandListener.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserPaperCommandListener.java
@ -39,8 +39,8 @@ import java.util.Map;

 public final class GeyserPaperCommandListener implements Listener {

+    @SuppressWarnings("UnstableApiUsage")
    @EventHandler
-    @SuppressWarnings("deprecation") // Used to indicate an unstable event
    public void onCommandSend(AsyncPlayerSendCommandsEvent<?> event) {
        // Documentation says to check (event.isAsynchronous() || !event.hasFiredAsync()), but as of Paper 1.18.2
        // event.hasFiredAsync is never true
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java
@ -29,6 +29,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.command.GeyserCommand;
 import org.geysermc.geyser.command.GeyserCommandExecutor;
@ -47,7 +48,7 @@ public class GeyserSpigotCommandExecutor extends GeyserCommandExecutor implement
    }

    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean onCommand(@NonNull CommandSender sender, @NonNull Command command, @NonNull String label, String[] args) {
        SpigotCommandSource commandSender = new SpigotCommandSource(sender);
        GeyserSession session = getGeyserSession(commandSender);

@ -78,7 +79,7 @@ public class GeyserSpigotCommandExecutor extends GeyserCommandExecutor implement
    }

    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
+    public List<String> onTabComplete(@NonNull CommandSender sender, @NonNull Command command, @NonNull String label, String[] args) {
        if (args.length == 1) {
            return tabComplete(new SpigotCommandSource(sender));
        }
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSource.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSource.java
@ -29,6 +29,7 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.command.GeyserCommandSource;
 import org.geysermc.geyser.platform.spigot.PaperAdventure;
 import org.geysermc.geyser.text.GeyserLocale;
@ -48,10 +49,11 @@ public class SpigotCommandSource implements GeyserCommandSource {
    }

    @Override
-    public void sendMessage(String message) {
+    public void sendMessage(@NonNull String message) {
        handle.sendMessage(message);
    }

+    @SuppressWarnings("deprecation")
    @Override
    public void sendMessage(Component message) {
        if (PaperAdventure.canSendMessageUsingComponent()) {
@ -68,9 +70,11 @@ public class SpigotCommandSource implements GeyserCommandSource {
        return handle instanceof ConsoleCommandSender;
    }

+    @SuppressWarnings("deprecation")
    @Override
    public String locale() {
        if (this.handle instanceof Player player) {
+            // getLocale() is deprecated on Paper, but not on Spigot
            return player.getLocale();
        }

--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java
@ -37,6 +37,7 @@ import org.geysermc.geyser.platform.spigot.GeyserSpigotPlugin;
 import org.geysermc.geyser.session.GeyserSession;

 import java.util.List;
+import java.util.Objects;

 /**
 * Used when block IDs need to be translated to the latest version
@ -52,6 +53,7 @@ public class GeyserSpigotLegacyNativeWorldManager extends GeyserSpigotNativeWorl
        ProtocolVersion serverVersion = plugin.getServerProtocolVersion();
        List<ProtocolPathEntry> protocolList = Via.getManager().getProtocolManager().getProtocolPath(GameProtocol.getJavaProtocolVersion(),
                serverVersion.getVersion());
+        Objects.requireNonNull(protocolList, "protocolList cannot be null");
        for (int oldBlockId : allBlockStates) {
            int newBlockId = oldBlockId;
            // protocolList should *not* be null; we checked for that before initializing this class
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java
@ -28,11 +28,11 @@ package org.geysermc.geyser.platform.spigot.world.manager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.geyser.adapters.spigot.SpigotAdapters;
 import org.geysermc.geyser.adapters.spigot.SpigotWorldAdapter;
 import org.geysermc.geyser.level.block.BlockStateValues;
 import org.geysermc.geyser.session.GeyserSession;
-import org.jetbrains.annotations.Nullable;

 public class GeyserSpigotNativeWorldManager extends GeyserSpigotWorldManager {
    protected final SpigotWorldAdapter adapter;
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java
@ -34,21 +34,23 @@ import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.nbt.NbtMap;
 import org.geysermc.erosion.bukkit.BukkitLecterns;
 import org.geysermc.erosion.bukkit.BukkitUtils;
 import org.geysermc.erosion.bukkit.PickBlockUtils;
 import org.geysermc.erosion.bukkit.SchedulerUtils;
+import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.level.GameRule;
 import org.geysermc.geyser.level.WorldManager;
 import org.geysermc.geyser.level.block.BlockStateValues;
 import org.geysermc.geyser.registry.BlockRegistries;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.util.BlockEntityUtils;
-import org.jetbrains.annotations.Nullable;

-import javax.annotation.Nonnull;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;

 /**
@ -128,7 +130,7 @@ public class GeyserSpigotWorldManager extends WorldManager {
        }
    }

-    private Chunk getChunk(World world, int x, int z) {
+    private @Nullable Chunk getChunk(World world, int x, int z) {
        if (!world.isChunkLoaded(x, z)) {
            return null;
        }
@ -136,6 +138,7 @@ public class GeyserSpigotWorldManager extends WorldManager {
    }

    private void sendLecternData(GeyserSession session, Chunk chunk, List<BlockEntityInfo> blockEntityInfos) {
+        //noinspection ForLoopReplaceableByForEach - avoid constructing Iterator
        for (int i = 0; i < blockEntityInfos.size(); i++) {
            BlockEntityInfo info = blockEntityInfos.get(i);
            Block block = chunk.getBlock(info.getX(), info.getY(), info.getZ());
@ -156,19 +159,34 @@ public class GeyserSpigotWorldManager extends WorldManager {
    }

    public boolean getGameRuleBool(GeyserSession session, GameRule gameRule) {
-        String value = Bukkit.getPlayer(session.getPlayerEntity().getUsername()).getWorld().getGameRuleValue(gameRule.getJavaID());
-        if (!value.isEmpty()) {
-            return Boolean.parseBoolean(value);
+        org.bukkit.GameRule<?> bukkitGameRule = org.bukkit.GameRule.getByName(gameRule.getJavaID());
+        if (bukkitGameRule == null) {
+            GeyserImpl.getInstance().getLogger().debug("Unknown game rule " + gameRule.getJavaID());
+            return gameRule.getDefaultBooleanValue();
        }
+
+        Player bukkitPlayer = Objects.requireNonNull(Bukkit.getPlayer(session.getPlayerEntity().getUuid()));
+        Object value = bukkitPlayer.getWorld().getGameRuleValue(bukkitGameRule);
+        if (value instanceof Boolean booleanValue) {
+            return booleanValue;
+        }
+        GeyserImpl.getInstance().getLogger().debug("Expected a bool for " + gameRule + " but got " + value);
        return gameRule.getDefaultBooleanValue();
    }

    @Override
    public int getGameRuleInt(GeyserSession session, GameRule gameRule) {
-        String value = Bukkit.getPlayer(session.getPlayerEntity().getUsername()).getWorld().getGameRuleValue(gameRule.getJavaID());
-        if (!value.isEmpty()) {
-            return Integer.parseInt(value);
+        org.bukkit.GameRule<?> bukkitGameRule = org.bukkit.GameRule.getByName(gameRule.getJavaID());
+        if (bukkitGameRule == null) {
+            GeyserImpl.getInstance().getLogger().debug("Unknown game rule " + gameRule.getJavaID());
+            return gameRule.getDefaultIntValue();
        }
+        Player bukkitPlayer = Objects.requireNonNull(Bukkit.getPlayer(session.getPlayerEntity().getUuid()));
+        Object value = bukkitPlayer.getWorld().getGameRuleValue(bukkitGameRule);
+        if (value instanceof Integer intValue) {
+            return intValue;
+        }
+        GeyserImpl.getInstance().getLogger().debug("Expected an int for " + gameRule + " but got " + value);
        return gameRule.getDefaultIntValue();
    }

@ -179,12 +197,11 @@ public class GeyserSpigotWorldManager extends WorldManager {

    @Override
    public boolean hasPermission(GeyserSession session, String permission) {
-        return Bukkit.getPlayer(session.getPlayerEntity().getUsername()).hasPermission(permission);
+        return Objects.requireNonNull(Bukkit.getPlayer(session.getPlayerEntity().getUsername())).hasPermission(permission);
    }

-    @Nonnull
    @Override
-    public CompletableFuture<@Nullable CompoundTag> getPickItemNbt(GeyserSession session, int x, int y, int z, boolean addNbtData) {
+    public @NonNull CompletableFuture<@Nullable CompoundTag> getPickItemNbt(GeyserSession session, int x, int y, int z, boolean addNbtData) {
        CompletableFuture<@Nullable CompoundTag> future = new CompletableFuture<>();
        Player bukkitPlayer;
        if ((bukkitPlayer = Bukkit.getPlayer(session.getPlayerEntity().getUuid())) == null) {