diff options
| author | Lulu13022002 <[email protected]> | 2024-10-26 19:41:56 +0200 |
|---|---|---|
| committer | Lulu13022002 <[email protected]> | 2024-10-26 19:41:56 +0200 |
| commit | 7d67d3f4f49ca061001d5d091557b8275c3a4e50 (patch) | |
| tree | a3670e767d3fdb7a81545524be116a96a8f05993 | |
| parent | 7162ff040480474b75f091609678b35bb458e99d (diff) | |
| download | Paper-7d67d3f4f49ca061001d5d091557b8275c3a4e50.tar.gz Paper-7d67d3f4f49ca061001d5d091557b8275c3a4e50.zip | |
fix DamageTypeTags init
| -rw-r--r-- | paper-api-generator/wideners.at | 2 | ||||
| -rw-r--r-- | patches/api/0495-fix-DamageTypeTags-init.patch | 21 |
2 files changed, 21 insertions, 2 deletions
diff --git a/paper-api-generator/wideners.at b/paper-api-generator/wideners.at index 60a5d241e7..6c8ce1529e 100644 --- a/paper-api-generator/wideners.at +++ b/paper-api-generator/wideners.at @@ -1,5 +1,3 @@ -public net/minecraft/server/WorldLoader loadAndReplaceLayer(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/server/RegistryLayer;Ljava/util/List;)Lnet/minecraft/core/LayeredRegistryAccess; - # for auto-marking experimental stuff public net/minecraft/core/RegistrySetBuilder entries public net/minecraft/core/RegistrySetBuilder$RegistryStub diff --git a/patches/api/0495-fix-DamageTypeTags-init.patch b/patches/api/0495-fix-DamageTypeTags-init.patch new file mode 100644 index 0000000000..2d775b1322 --- /dev/null +++ b/patches/api/0495-fix-DamageTypeTags-init.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lulu13022002 <[email protected]> +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() { |