mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 22:13:42 +01:00
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
||
|
|
Date: Fri, 3 May 2024 22:56:12 +0200
|
||
|
|
Subject: [PATCH] Add missing wind charge damage type
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/damage/DamageType.java b/src/main/java/org/bukkit/damage/DamageType.java
|
||
|
|
index 9f2d80a91e12f09407d737668f4178e81811fe14..e1367e86c21a1c733c8db45b357e9a95e093644a 100644
|
||
|
|
--- a/src/main/java/org/bukkit/damage/DamageType.java
|
||
|
|
+++ b/src/main/java/org/bukkit/damage/DamageType.java
|
||
|
|
@@ -65,6 +65,12 @@ public interface DamageType extends Keyed, Translatable {
|
||
|
|
public static final DamageType BAD_RESPAWN_POINT = getDamageType("bad_respawn_point");
|
||
|
|
public static final DamageType OUTSIDE_BORDER = getDamageType("outside_border");
|
||
|
|
public static final DamageType GENERIC_KILL = getDamageType("generic_kill");
|
||
|
|
+ // Paper start
|
||
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.UPDATE_1_21)
|
||
|
|
+ @ApiStatus.Experimental
|
||
|
|
+ @org.jetbrains.annotations.Nullable
|
||
|
|
+ DamageType WIND_CHARGE = getExperimentalDamageType("wind_charge");
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
@NotNull
|
||
|
|
private static DamageType getDamageType(@NotNull String key) {
|
||
|
|
@@ -72,6 +78,12 @@ public interface DamageType extends Keyed, Translatable {
|
||
|
|
return Preconditions.checkNotNull(Registry.DAMAGE_TYPE.get(namespacedKey), "No DamageType found for %s. This is a bug.", namespacedKey);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ private static @org.jetbrains.annotations.Nullable DamageType getExperimentalDamageType(@NotNull String key) {
|
||
|
|
+ return Registry.DAMAGE_TYPE.get(NamespacedKey.minecraft(key));
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
/**
|
||
|
|
* {@inheritDoc}
|
||
|
|
* <p>
|