From efc7364e5b569e5aa72b583e776e21d299af9d03 Mon Sep 17 00:00:00 2001
From: Bukkit/Spigot <noreply+git-bukkit@papermc.io>
Date: Tue, 5 Nov 2024 11:58:25 +1100
Subject: [PATCH] SPIGOT-7944, #1077: Allow nullable fields in DamageTypeTags

By: Doc <nachito94@msn.com>
---
 .../src/main/java/org/bukkit/tag/DamageTypeTags.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/tag/DamageTypeTags.java b/paper-api/src/main/java/org/bukkit/tag/DamageTypeTags.java
index 12d14ab29..548122148 100644
--- a/paper-api/src/main/java/org/bukkit/tag/DamageTypeTags.java
+++ b/paper-api/src/main/java/org/bukkit/tag/DamageTypeTags.java
@@ -1,12 +1,11 @@
 package org.bukkit.tag;
 
-import java.util.Objects;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Tag;
 import org.bukkit.damage.DamageType;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Vanilla {@link DamageType} {@link Tag tags}.
@@ -32,7 +31,10 @@ public final class DamageTypeTags {
     public static final Tag<DamageType> BYPASSES_INVULNERABILITY = getTag("bypasses_invulnerability");
     /**
      * Vanilla tag representing damage types which bypass cooldowns.
+     * <br>
+     * <b>Note:</b> this can be null unless a datapack add values to this tag because vanilla not has any values for this.
      */
+    @Nullable
     public static final Tag<DamageType> BYPASSES_COOLDOWN = getTag("bypasses_cooldown");
     /**
      * Vanilla tag representing damage types which bypass effects.
@@ -158,9 +160,9 @@ public final class DamageTypeTags {
     @ApiStatus.Internal
     public static final String REGISTRY_DAMAGE_TYPES = "damage_types";
 
-    @NotNull
+    @Nullable
     private static Tag<DamageType> getTag(String key) {
-        return Objects.requireNonNull(Bukkit.getTag(REGISTRY_DAMAGE_TYPES, NamespacedKey.minecraft(key), DamageType.class));
+        return Bukkit.getTag(REGISTRY_DAMAGE_TYPES, NamespacedKey.minecraft(key), DamageType.class);
     }
 
     private DamageTypeTags() {