Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-14 12:00:06 +01:00
fix DamageTypeTags init
Dieser Commit ist enthalten in:
Ursprung
7162ff0404
Commit
7d67d3f4f4
@ -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
|
||||
|
21
patches/api/0495-fix-DamageTypeTags-init.patch
Normale Datei
21
patches/api/0495-fix-DamageTypeTags-init.patch
Normale Datei
@ -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() {
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren