From 2948eb296d2b47e89cdf9a61b079e71251991eae Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 15 Apr 2025 15:54:10 +0100
Subject: [PATCH] Mitigate an issue when loading a spigot config with null spam
 exclusion entries

---
 paper-server/src/main/java/org/spigotmc/SpigotConfig.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/spigotmc/SpigotConfig.java b/paper-server/src/main/java/org/spigotmc/SpigotConfig.java
index 7c585b71d0..c935d75b83 100644
--- a/paper-server/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/paper-server/src/main/java/org/spigotmc/SpigotConfig.java
@@ -11,6 +11,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Level;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -250,7 +251,7 @@ public class SpigotConfig {
         if (enabled instanceof Boolean value) {
             SpigotConfig.enableSpamExclusions = value;
         } else {
-            if (spamExclusions.size() == 1 && spamExclusions.getFirst().equals("/skill")) {
+            if (spamExclusions.size() == 1 && Objects.equals(spamExclusions.getFirst(), "/skill")) {
                 SpigotConfig.enableSpamExclusions = false;
                 SpigotConfig.set("commands.enable-spam-exclusions", false);
             } else {