diff --git a/patches/server/0975-Add-speed-argument-to-ProjectileSource-launchProject.patch b/patches/server/0975-Add-speed-argument-to-ProjectileSource-launchProject.patch index d7ff60cdc2..b4aca8630b 100644 --- a/patches/server/0975-Add-speed-argument-to-ProjectileSource-launchProject.patch +++ b/patches/server/0975-Add-speed-argument-to-ProjectileSource-launchProject.patch @@ -12,11 +12,9 @@ index d43859f8aa7beed82dd3a146bb1086982cd0cda7..e5eb4cdb69f761709ecf8a45183ba50f import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionType; import org.bukkit.util.BlockIterator; -+import org.bukkit.util.Consumer; ++import org.bukkit.util.Consumer; //Paper import org.bukkit.util.RayTraceResult; import org.bukkit.util.Vector; -+import org.jetbrains.annotations.NotNull; -+import org.jetbrains.annotations.Nullable; public class CraftLivingEntity extends CraftEntity implements LivingEntity { private CraftEntityEquipment equipment; @@ -29,12 +27,12 @@ index d43859f8aa7beed82dd3a146bb1086982cd0cda7..e5eb4cdb69f761709ecf8a45183ba50f + } + + @Override -+ public @NotNull T launchProjectile(@NotNull Class projectile, @Nullable Vector velocity, @Nullable Consumer function) { ++ public T launchProjectile(Class projectile, Vector velocity, Consumer function) { + return this.launchProjectile(projectile, velocity, 1f, function); + } + + @Override -+ public @NotNull T launchProjectile(@NotNull Class projectile, @Nullable Vector velocity, float speed) { ++ public T launchProjectile(Class projectile, Vector velocity, float speed) { + // Paper start - initial speed + return this.launchProjectile(projectile, velocity, speed, null); } @@ -43,8 +41,7 @@ index d43859f8aa7beed82dd3a146bb1086982cd0cda7..e5eb4cdb69f761709ecf8a45183ba50f @SuppressWarnings("unchecked") - public T launchProjectile(Class projectile, Vector velocity, org.bukkit.util.Consumer function) { + public T launchProjectile(Class projectile, Vector velocity, float speed, org.bukkit.util.Consumer function) { - // Paper end - launchProjectile consumer -+ // Paper end - initial speed + // Paper end - launchProjectile consumer & initial speed Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation"); net.minecraft.world.level.Level world = ((CraftWorld) getWorld()).getHandle(); @@ -127,12 +124,12 @@ index 2afb7af0a90959edd3b0ead2fe4d9018b5560aa4..7f3ce96dbc158400ff23515d7c0ac026 @Override - public T launchProjectile(Class projectile, Vector velocity, org.bukkit.util.Consumer function) { -+ public @NotNull T launchProjectile(@NotNull Class projectile, @Nullable Vector velocity, @Nullable Consumer function) { ++ public T launchProjectile(Class projectile, Vector velocity, Consumer function) { + return this.launchProjectile(projectile, velocity, 1f, null); + } + + @Override -+ public @NotNull T launchProjectile(@NotNull Class projectile, @Nullable Vector velocity, float speed) { ++ public T launchProjectile(Class projectile, Vector velocity, float speed) { + // Paper start - initial speed + return this.launchProjectile(projectile, velocity, speed, null); + } @@ -147,7 +144,7 @@ index 2afb7af0a90959edd3b0ead2fe4d9018b5560aa4..7f3ce96dbc158400ff23515d7c0ac026 } // Copied from DispenseBehaviorProjectile - ((net.minecraft.world.entity.projectile.Projectile) launch).shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), b, a); -+ ((net.minecraft.world.entity.projectile.Projectile) launch).shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), b*speed, a); ++ ((net.minecraft.world.entity.projectile.Projectile) launch).shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), b * speed, a); } if (velocity != null) {