From 254730e85e929b15a761c55f3edf50d9c816fb63 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Thu, 12 Dec 2024 06:41:46 -0800
Subject: [PATCH] fix(ridables): stop error by calling correct particles method

---
 patches/server/0009-Ridables.patch                        | 8 ++++----
 .../server/0070-Add-allow-water-in-end-world-option.patch | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/patches/server/0009-Ridables.patch b/patches/server/0009-Ridables.patch
index 6cb681bea..02a27812a 100644
--- a/patches/server/0009-Ridables.patch
+++ b/patches/server/0009-Ridables.patch
@@ -6379,7 +6379,7 @@ index 0000000000000000000000000000000000000000..922e48799c43ca322a8f550c98a26e1e
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..5a3df169da4a673d07d17f4f0f016721b9e6bf95
+index 0000000000000000000000000000000000000000..e33e54fc31ab7dcff054d0ab245d6c3391d06449
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
 @@ -0,0 +1,101 @@
@@ -6437,7 +6437,7 @@ index 0000000000000000000000000000000000000000..5a3df169da4a673d07d17f4f0f016721
 +
 +        Vec3 motDouble = mot.scale(2.0);
 +        for (int i = 0; i < 5; i++) {
-+            ((ServerLevel) level()).sendParticles(null, ParticleTypes.BUBBLE,
++            ((ServerLevel) level()).sendParticlesSource(null, ParticleTypes.BUBBLE,
 +                    false, true,
 +                    getX() + random.nextFloat() / 2 - 0.25F,
 +                    getY() + random.nextFloat() / 2 - 0.25F,
@@ -6486,7 +6486,7 @@ index 0000000000000000000000000000000000000000..5a3df169da4a673d07d17f4f0f016721
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f6358e9afc6758f2b20e97b6037f6db0204a7dd5
+index 0000000000000000000000000000000000000000..3759e45afe16bf1d8a37b78d3526ee446e63cfe5
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
 @@ -0,0 +1,123 @@
@@ -6546,7 +6546,7 @@ index 0000000000000000000000000000000000000000..f6358e9afc6758f2b20e97b6037f6db0
 +
 +        Vec3 motDouble = mot.scale(2.0);
 +        for (int i = 0; i < 5; i++) {
-+            ((ServerLevel) level()).sendParticles(null, ParticleTypes.FLAME,
++            ((ServerLevel) level()).sendParticlesSource(null, ParticleTypes.FLAME,
 +                    false, true,
 +                    getX() + random.nextFloat() / 2 - 0.25F,
 +                    getY() + random.nextFloat() / 2 - 0.25F,
diff --git a/patches/server/0070-Add-allow-water-in-end-world-option.patch b/patches/server/0070-Add-allow-water-in-end-world-option.patch
index 123fd2480..fcff21c76 100644
--- a/patches/server/0070-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0070-Add-allow-water-in-end-world-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add allow water in end world option
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java
-index 3bddfb6f7412ab86e0c090d0cbc6cf254b3f891c..5e64a3243c1d8536a1e86983e4486a58ef6ab9fc 100644
+index 3bddfb6f7412ab86e0c090d0cbc6cf254b3f891c..38f287d97544b8a5b080837e38710dc4e94ae9bf 100644
 --- a/src/main/java/net/minecraft/world/item/BucketItem.java
 +++ b/src/main/java/net/minecraft/world/item/BucketItem.java
 @@ -196,7 +196,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
@@ -22,7 +22,7 @@ index 3bddfb6f7412ab86e0c090d0cbc6cf254b3f891c..5e64a3243c1d8536a1e86983e4486a58
  
                  for (int l = 0; l < 8; ++l) {
 -                    world.addParticle(ParticleTypes.LARGE_SMOKE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D);
-+                    ((ServerLevel) world).sendParticles(null, ParticleTypes.LARGE_SMOKE, false, true, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 1, 0.0D, 0.0D, 0.0D, 0.0D); // Purpur
++                    ((ServerLevel) world).sendParticlesSource(null, ParticleTypes.LARGE_SMOKE, false, true, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 1, 0.0D, 0.0D, 0.0D, 0.0D); // Purpur
                  }
  
                  return true;
@@ -68,7 +68,7 @@ index a94762e65853ccad38cf90b0049ca256106c0c9f..38633e168a9b36e37feea00964d53e65
          } else {
              world.setBlockAndUpdate(pos, IceBlock.meltsInto());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 6228d23bd84e59a9e1f01414cc9f00c33cc64cd0..9f98b87ccc60db9a531180de1ed649de118db56f 100644
+index df61db286f8b098a16c59a64714554d6d4c60655..5aa172d86f3d36a239147438e8d71c73ec2a3cf0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -247,6 +247,11 @@ public class PurpurConfig {