diff options
Diffstat (limited to 'patches/api/0252-Add-missing-effects.patch')
| -rw-r--r-- | patches/api/0252-Add-missing-effects.patch | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/patches/api/0252-Add-missing-effects.patch b/patches/api/0252-Add-missing-effects.patch index 52e92823ef..8db72d8762 100644 --- a/patches/api/0252-Add-missing-effects.patch +++ b/patches/api/0252-Add-missing-effects.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing effects Co-authored-by: Jake Potrebic <[email protected]> diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java -index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..88e93da6021b90a3351df17d95adc4d9277578f8 100644 +index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..d98612cad7f7477f6d4fe496f4d87b139aa3c681 100644 --- a/src/main/java/org/bukkit/Effect.java +++ b/src/main/java/org/bukkit/Effect.java @@ -131,9 +131,9 @@ public enum Effect { @@ -21,7 +21,17 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..88e93da6021b90a3351df17d95adc4d9 * additional info. */ POTION_BREAK(2002, Type.VISUAL, Color.class), -@@ -177,7 +177,9 @@ public enum Effect { +@@ -168,7 +168,9 @@ public enum Effect { + PORTAL_TRAVEL(1032, Type.SOUND), + /** + * The sound played when launching an endereye ++ * @deprecated No longer exists + */ ++ @Deprecated(forRemoval = true, since = "1.21") // Paper + ENDEREYE_LAUNCH(1003, Type.SOUND), + /** + * The sound played when launching a firework +@@ -177,7 +179,9 @@ public enum Effect { /** * Particles displayed when a villager grows a plant, data * is the number of particles @@ -31,7 +41,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..88e93da6021b90a3351df17d95adc4d9 VILLAGER_PLANT_GROW(2005, Type.VISUAL, Integer.class), /** * The sound/particles used by the enderdragon's breath -@@ -336,21 +338,197 @@ public enum Effect { +@@ -336,21 +340,199 @@ public enum Effect { * block. */ OXIDISED_COPPER_SCRAPE(3005, Type.VISUAL), @@ -208,7 +218,9 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..88e93da6021b90a3351df17d95adc4d9 + /** + * {@link Boolean} param is true for "ominous" vaults + */ -+ TRIAL_SPAWNER_SPAWN_ITEM(3021, Type.VISUAL, Boolean.class) ++ TRIAL_SPAWNER_SPAWN_ITEM(3021, Type.VISUAL, Boolean.class), ++ ++ SOUND_WITH_CHARGE_SHOT(1051, Type.SOUND), ; + private static final org.apache.logging.log4j.Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger(); + // Paper end @@ -233,7 +245,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..88e93da6021b90a3351df17d95adc4d9 } /** -@@ -366,8 +544,10 @@ public enum Effect { +@@ -366,8 +548,10 @@ public enum Effect { /** * @return The type of the effect. @@ -244,7 +256,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..88e93da6021b90a3351df17d95adc4d9 public Type getType() { return this.type; } -@@ -378,9 +558,16 @@ public enum Effect { +@@ -378,9 +562,16 @@ public enum Effect { */ @Nullable public Class<?> getData() { @@ -262,7 +274,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..88e93da6021b90a3351df17d95adc4d9 /** * Gets the Effect associated with the given ID. * -@@ -396,12 +583,26 @@ public enum Effect { +@@ -396,12 +587,26 @@ public enum Effect { static { for (Effect effect : values()) { |