spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-04-13 09:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-7944, #1077: Allow nullable fields in DamageTypeTags

Browse source
This commit is contained in:
Doc 2024-11-05 11:58:25 +11:00 • committed by md_5
parent b9df8e9f23
commit 54a3693866
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/bukkit/tag/DamageTypeTags.java
View file

@ -1,12 +1,11 @@
package org.bukkit.tag; package org.bukkit.tag;
import java.util.Objects;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.Tag; import org.bukkit.Tag;
import org.bukkit.damage.DamageType; import org.bukkit.damage.DamageType;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;
/** /**
* Vanilla {@link DamageType} {@link Tag tags}. * Vanilla {@link DamageType} {@link Tag tags}.
@ -32,7 +31,10 @@ public final class DamageTypeTags {
public static final Tag<DamageType> BYPASSES_INVULNERABILITY = getTag("bypasses_invulnerability"); public static final Tag<DamageType> BYPASSES_INVULNERABILITY = getTag("bypasses_invulnerability");
/** /**
* Vanilla tag representing damage types which bypass cooldowns. * 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"); public static final Tag<DamageType> BYPASSES_COOLDOWN = getTag("bypasses_cooldown");
/** /**
* Vanilla tag representing damage types which bypass effects. * Vanilla tag representing damage types which bypass effects.
@ -158,9 +160,9 @@ public final class DamageTypeTags {
@ApiStatus.Internal @ApiStatus.Internal
public static final String REGISTRY_DAMAGE_TYPES = "damage_types"; public static final String REGISTRY_DAMAGE_TYPES = "damage_types";
@NotNull @Nullable
private static Tag<DamageType> getTag(String key) { 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() { private DamageTypeTags() {