1 files changed, 10 insertions, 15 deletions
diff --git a/patches/api/0158-Add-PlayerConnectionCloseEvent.patch b/patches/api/0158-Add-PlayerConnectionCloseEvent.patch
index 6264223dd9..98f34635d0 100644
--- a/patches/api/0158-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/api/0158-Add-PlayerConnectionCloseEvent.patch
@@ -35,21 +35,20 @@ is undefined.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d0fb13adc140f1ca74d0c3448f92baa60684f3e2
+index 0000000000000000000000000000000000000000..5f5afcdb3c9e669ed0e730c720ad91d16b95602c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,83 @@
 +package com.destroystokyo.paper.event.player;
 +
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+
 +import java.net.InetAddress;
 +import java.util.UUID;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
 +import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 +import org.bukkit.event.player.PlayerQuitEvent;
 +import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
++import org.jspecify.annotations.NullMarked;
 +
 +/**
 + * <p>
@@ -76,16 +75,17 @@ index 0000000000000000000000000000000000000000..d0fb13adc140f1ca74d0c3448f92baa6
 + * The event may be invoked asynchronously or synchronously. Plugins should check
 + * {@link Event#isAsynchronous()} and handle accordingly.
 + */
++@NullMarked
 +public class PlayerConnectionCloseEvent extends Event {
 +
 +    private static final HandlerList HANDLER_LIST = new HandlerList();
 +
-+    @NotNull private final UUID playerUniqueId;
-+    @NotNull private final String playerName;
-+    @NotNull private final InetAddress ipAddress;
++    private final UUID playerUniqueId;
++    private final String playerName;
++    private final InetAddress ipAddress;
 +
 +    @ApiStatus.Internal
-+    public PlayerConnectionCloseEvent(@NotNull final UUID playerUniqueId, @NotNull final String playerName, @NotNull final InetAddress ipAddress, final boolean async) {
++    public PlayerConnectionCloseEvent(final UUID playerUniqueId, final String playerName, final InetAddress ipAddress, final boolean async) {
 +        super(async);
 +        this.playerUniqueId = playerUniqueId;
 +        this.playerName = playerName;
@@ -95,7 +95,6 @@ index 0000000000000000000000000000000000000000..d0fb13adc140f1ca74d0c3448f92baa6
 +    /**
 +     * Returns the {@code UUID} of the player disconnecting.
 +     */
-+    @NotNull
 +    public UUID getPlayerUniqueId() {
 +        return this.playerUniqueId;
 +    }
@@ -103,7 +102,6 @@ index 0000000000000000000000000000000000000000..d0fb13adc140f1ca74d0c3448f92baa6
 +    /**
 +     * Returns the name of the player disconnecting.
 +     */
-+    @NotNull
 +    public String getPlayerName() {
 +        return this.playerName;
 +    }
@@ -111,18 +109,15 @@ index 0000000000000000000000000000000000000000..d0fb13adc140f1ca74d0c3448f92baa6
 +    /**
 +     * Returns the player's IP address.
 +     */
-+    @NotNull
 +    public InetAddress getIpAddress() {
 +        return this.ipAddress;
 +    }
 +
-+    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
 +        return HANDLER_LIST;
 +    }
 +
-+    @NotNull
 +    public static HandlerList getHandlerList() {
 +        return HANDLER_LIST;
 +    }