mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 00:10:32 +01:00
71c84c8132
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MelnCat <melncatuwu@gmail.com>
|
|
Date: Mon, 19 Sep 2022 14:04:13 -0700
|
|
Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/projectiles/ProjectileSource.java b/src/main/java/org/bukkit/projectiles/ProjectileSource.java
|
|
index eabd8b926ec1c934cd7e77b7cc6adfae16771021..96ebd30d339060758e726e9e1e7428d1d0813c17 100644
|
|
--- a/src/main/java/org/bukkit/projectiles/ProjectileSource.java
|
|
+++ b/src/main/java/org/bukkit/projectiles/ProjectileSource.java
|
|
@@ -31,4 +31,23 @@ public interface ProjectileSource {
|
|
*/
|
|
@NotNull
|
|
public <T extends Projectile> T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity);
|
|
+
|
|
+ // Paper start - add consumer to launchProjectile
|
|
+ /**
|
|
+ * Launches a {@link Projectile} from the ProjectileSource with an
|
|
+ * initial velocity, with the supplied function run before the
|
|
+ * entity is added to the world.
|
|
+ * <br>
|
|
+ * Note that when the function is run, the entity will not be actually in
|
|
+ * the world. Any operation involving such as teleporting the entity is undefined
|
|
+ * until after this function returns.
|
|
+ *
|
|
+ * @param <T> a projectile subclass
|
|
+ * @param projectile class of the projectile to launch
|
|
+ * @param velocity the velocity with which to launch
|
|
+ * @param function the function to be run before the entity is spawned
|
|
+ * @return the launched projectile
|
|
+ */
|
|
+ <T extends Projectile> @NotNull T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity, java.util.function.@Nullable Consumer<? super T> function);
|
|
+ // Paper end - add consumer to launchProjectile
|
|
}
|