aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch')
-rw-r--r--patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch69
1 files changed, 0 insertions, 69 deletions
diff --git a/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
deleted file mode 100644
index 9a55defb23..0000000000
--- a/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <[email protected]>
-Date: Mon, 19 Sep 2022 14:16:10 -0700
-Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 741cc56304005c48b26966f617d282bae7a87ee6..e6727100c3ec18a32e08d027cd1b4c39b913d554 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -569,8 +569,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
- }
-
- @Override
-- @SuppressWarnings("unchecked")
- public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity) {
-+ // Paper start - launchProjectile consumer
-+ return this.launchProjectile(projectile, velocity, null);
-+ }
-+
-+ @Override
-+ @SuppressWarnings("unchecked")
-+ public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, java.util.function.Consumer<? super T> function) {
-+ // Paper end - launchProjectile consumer
- Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation");
-
- net.minecraft.world.level.Level world = ((CraftWorld) this.getWorld()).getHandle();
-@@ -665,6 +672,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
- if (velocity != null) {
- ((T) launch.getBukkitEntity()).setVelocity(velocity);
- }
-+ // Paper start - launchProjectile consumer
-+ if (function != null) {
-+ function.accept((T) launch.getBukkitEntity());
-+ }
-+ // Paper end - launchProjectile consumer
-
- world.addFreshEntity(launch);
- return (T) launch.getBukkitEntity();
-diff --git a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-index 8b57044518fbb0fd507da6ae3ff12b99eff70b37..2a6c4a74ff065110bb09b528f2d5f80b560a587a 100644
---- a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-+++ b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-@@ -56,6 +56,13 @@ public class CraftBlockProjectileSource implements BlockProjectileSource {
-
- @Override
- public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity) {
-+ // Paper start - launchProjectile consumer
-+ return this.launchProjectile(projectile, velocity, null);
-+ }
-+
-+ @Override
-+ public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, java.util.function.Consumer<? super T> function) {
-+ // Paper end - launchProjectile consumer
- Preconditions.checkArgument(this.getBlock().getType() == Material.DISPENSER, "Block is no longer dispenser");
- // Copied from BlockDispenser.dispense()
- BlockSource sourceblock = new BlockSource((ServerLevel) this.dispenserBlock.getLevel(), this.dispenserBlock.getBlockPos(), this.dispenserBlock.getBlockState(), this.dispenserBlock);
-@@ -140,6 +147,11 @@ public class CraftBlockProjectileSource implements BlockProjectileSource {
- if (velocity != null) {
- ((T) launch.getBukkitEntity()).setVelocity(velocity);
- }
-+ // Paper start
-+ if (function != null) {
-+ function.accept((T) launch.getBukkitEntity());
-+ }
-+ // Paper end
-
- world.addFreshEntity(launch);
- return (T) launch.getBukkitEntity();