-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7162ff0
commit 7d67d3f
Showing
2 changed files
with
21 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> | ||
Date: Sat, 26 Oct 2024 19:29:41 +0200 | ||
Subject: [PATCH] fix DamageTypeTags init | ||
|
||
|
||
diff --git a/src/main/java/org/bukkit/tag/DamageTypeTags.java b/src/main/java/org/bukkit/tag/DamageTypeTags.java | ||
index 12d14ab2947517eedc563acf647857f13021f80c..c02d92b607dfc998e81b7722464cefd867c80072 100644 | ||
--- a/src/main/java/org/bukkit/tag/DamageTypeTags.java | ||
+++ b/src/main/java/org/bukkit/tag/DamageTypeTags.java | ||
@@ -158,9 +158,8 @@ public final class DamageTypeTags { | ||
@ApiStatus.Internal | ||
public static final String REGISTRY_DAMAGE_TYPES = "damage_types"; | ||
|
||
- @NotNull | ||
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); // Paper - bypasses_cooldown is not defined in vanilla | ||
} | ||
|
||
private DamageTypeTags() { |