diff options
Diffstat (limited to 'patches/api/0258-Add-missing-effects.patch')
| -rw-r--r-- | patches/api/0258-Add-missing-effects.patch | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/patches/api/0258-Add-missing-effects.patch b/patches/api/0258-Add-missing-effects.patch index 1bf1d3fb63..63c42ebfec 100644 --- a/patches/api/0258-Add-missing-effects.patch +++ b/patches/api/0258-Add-missing-effects.patch @@ -3,9 +3,10 @@ From: Ivan Pekov <[email protected]> Date: Tue, 5 Jan 2021 10:19:11 +0200 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 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef95bf7c03 100644 +index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef639e810bd 100644 --- a/src/main/java/org/bukkit/Effect.java +++ b/src/main/java/org/bukkit/Effect.java @@ -132,12 +132,12 @@ public enum Effect { @@ -24,7 +25,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef /** * Visual effect of an instant splash potion breaking. Needs color data * value as additional info. -@@ -337,21 +337,124 @@ public enum Effect { +@@ -337,21 +337,146 @@ public enum Effect { * block. */ OXIDISED_COPPER_SCRAPE(3005, Type.VISUAL), @@ -122,13 +123,35 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef + + SOUND_STOP_JUKEBOX_SONG(1011, Type.SOUND), + ++ CRAFTER_CRAFT(1049, Type.SOUND), ++ ++ CRAFTER_FAIL(1050, Type.SOUND), ++ ++ /** ++ * {@link BlockFace} param is the direction to shoot ++ */ ++ SHOOT_WHITE_SMOKE(2010, Type.VISUAL, BlockFace.class), ++ + PARTICLES_SCULK_CHARGE(3006, Type.VISUAL, Integer.class), + + PARTICLES_SCULK_SHRIEK(3007, Type.SOUND), + + PARTICLES_AND_SOUND_BRUSH_BLOCK_COMPLETE(3008, Type.VISUAL, org.bukkit.block.data.BlockData.class), + -+ PARTICLES_EGG_CRACK(3009, Type.VISUAL) ++ PARTICLES_EGG_CRACK(3009, Type.VISUAL), ++ ++ GUST_DUST(3010, Type.VISUAL), ++ ++ TRIAL_SPAWNER_SPAWN(3011, Type.VISUAL), ++ ++ TRIAL_SPAWNER_SPAWN_MOB_AT(3012, Type.VISUAL), ++ ++ /** ++ * {@link Integer} param is the number of players ++ */ ++ TRIAL_SPAWNER_DETECT_PLAYER(3013, Type.VISUAL, Integer.class), ++ ++ TRIAL_SPAWNER_EJECT_ITEM(3014, Type.VISUAL), ; + private static final org.apache.logging.log4j.Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger(); + // Paper end @@ -153,7 +176,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef } /** -@@ -367,8 +470,10 @@ public enum Effect { +@@ -367,8 +492,10 @@ public enum Effect { /** * @return The type of the effect. @@ -164,7 +187,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef public Type getType() { return this.type; } -@@ -379,8 +484,15 @@ public enum Effect { +@@ -379,8 +506,15 @@ public enum Effect { */ @Nullable public Class<?> getData() { @@ -181,7 +204,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef /** * Gets the Effect associated with the given ID. -@@ -397,12 +509,26 @@ public enum Effect { +@@ -397,12 +531,26 @@ public enum Effect { static { for (Effect effect : values()) { |