Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

fix DamageTypeTags init

Browse Source
This commit is contained in:
Lulu13022002 2024-10-26 19:41:56 +02:00
parent 7162ff0404
commit 7d67d3f4f4
No known key found for this signature in database
GPG Key ID: 491C8F0B8ACDEB01
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paper-api-generator/wideners.at
View File

@ -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 # for auto-marking experimental stuff
public net/minecraft/core/RegistrySetBuilder entries public net/minecraft/core/RegistrySetBuilder entries
public net/minecraft/core/RegistrySetBuilder$RegistryStub public net/minecraft/core/RegistrySetBuilder$RegistryStub

21
patches/api/0495-fix-DamageTypeTags-init.patch Normal file
View File

@ -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() {