aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0254-Add-missing-effects.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/api/0254-Add-missing-effects.patch')
-rw-r--r--patches/api/0254-Add-missing-effects.patch26
1 files changed, 21 insertions, 5 deletions
diff --git a/patches/api/0254-Add-missing-effects.patch b/patches/api/0254-Add-missing-effects.patch
index 63710b51cc..1bda7a8851 100644
--- a/patches/api/0254-Add-missing-effects.patch
+++ b/patches/api/0254-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..2d50f5e3f95e280ae5741514d5eba6440d9966ce 100644
+index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..326c99d91ae125b28054b5730b9576b214e4595e 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..2d50f5e3f95e280ae5741514d5eba644
* additional info.
*/
POTION_BREAK(2002, Type.VISUAL, Color.class),
-@@ -336,21 +336,146 @@ public enum Effect {
+@@ -177,7 +177,9 @@ public enum Effect {
+ /**
+ * Particles displayed when a villager grows a plant, data
+ * is the number of particles
++ * @deprecated partially replaced by {@link #BEE_GROWTH}
+ */
++ @Deprecated(forRemoval = true, since = "1.20.5") // Paper
+ VILLAGER_PLANT_GROW(2005, Type.VISUAL, Integer.class),
+ /**
+ * The sound/particles used by the enderdragon's breath
+@@ -336,21 +338,152 @@ public enum Effect {
* block.
*/
OXIDISED_COPPER_SCRAPE(3005, Type.VISUAL),
@@ -128,6 +138,11 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..2d50f5e3f95e280ae5741514d5eba644
+ */
+ SHOOT_WHITE_SMOKE(2010, Type.VISUAL, BlockFace.class),
+
++ /**
++ * {@link Integer} param is the number of particles
++ */
++ BEE_GROWTH(2011, Type.VISUAL, Integer.class),
++
+ PARTICLES_SCULK_CHARGE(3006, Type.VISUAL, Integer.class),
+
+ PARTICLES_SCULK_SHRIEK(3007, Type.SOUND),
@@ -136,6 +151,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..2d50f5e3f95e280ae5741514d5eba644
+
+ PARTICLES_EGG_CRACK(3009, Type.VISUAL),
+
++ @Deprecated(forRemoval = true, since = "1.20.5")
+ GUST_DUST(3010, Type.VISUAL),
+
+ TRIAL_SPAWNER_SPAWN(3011, Type.VISUAL),
@@ -172,7 +188,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..2d50f5e3f95e280ae5741514d5eba644
}
/**
-@@ -366,8 +491,10 @@ public enum Effect {
+@@ -366,8 +499,10 @@ public enum Effect {
/**
* @return The type of the effect.
@@ -183,7 +199,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..2d50f5e3f95e280ae5741514d5eba644
public Type getType() {
return this.type;
}
-@@ -378,8 +505,15 @@ public enum Effect {
+@@ -378,8 +513,15 @@ public enum Effect {
*/
@Nullable
public Class<?> getData() {
@@ -200,7 +216,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..2d50f5e3f95e280ae5741514d5eba644
/**
* Gets the Effect associated with the given ID.
-@@ -396,12 +530,26 @@ public enum Effect {
+@@ -396,12 +538,26 @@ public enum Effect {
static {
for (Effect effect : values()) {