diff --git a/patches/server/0090-Phantoms-burn-in-light.patch b/patches/server/0090-Phantoms-burn-in-light.patch
index 70acb2cb3..90be944ea 100644
--- a/patches/server/0090-Phantoms-burn-in-light.patch
+++ b/patches/server/0090-Phantoms-burn-in-light.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
-index e20b26ae0435c593218541eba6c68ef297fea7c8..8864c055940b182518a8e17180e2c1d27849b3ff 100644
+index e20b26ae0435c593218541eba6c68ef297fea7c8..fd2e3a4abcfedaf04db4277291983627c097b545 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 @@ -18,6 +18,7 @@ import net.minecraft.sounds.SoundEffect;
@@ -37,7 +37,7 @@ index e20b26ae0435c593218541eba6c68ef297fea7c8..8864c055940b182518a8e17180e2c1d2
      @Override
      public void movementTick() {
 -        if (this.isAlive() && shouldBurnInDay && this.eG()) { // Paper - Configurable Burning
-+        if (this.isAlive() && ((this.isInDaylight() && (shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight)) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur
++        if (this.isAlive() && (((shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight) && this.isInDaylight()) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur
              this.setOnFire(8);
          }
  
diff --git a/patches/server/0103-Ridables.patch b/patches/server/0103-Ridables.patch
index 9abef4ede..3ec40034a 100644
--- a/patches/server/0103-Ridables.patch
+++ b/patches/server/0103-Ridables.patch
@@ -4229,7 +4229,7 @@ index fe80e93b00f3bb2f297c6528c3951313fa3c08c7..15ed51a2746c09538a425fce25fa25f2
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
-index 8864c055940b182518a8e17180e2c1d27849b3ff..851dc37d96d11f3f64b4eb373344e0c11a356540 100644
+index fd2e3a4abcfedaf04db4277291983627c097b545..1ea3054cebbf32588219f8915f9fb496495e3a10 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 @@ -13,6 +13,7 @@ import net.minecraft.network.syncher.DataWatcher;
@@ -4334,8 +4334,8 @@ index 8864c055940b182518a8e17180e2c1d27849b3ff..851dc37d96d11f3f64b4eb373344e0c1
  
      @Override
      public void movementTick() {
--        if (this.isAlive() && ((this.isInDaylight() && (shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight)) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur
-+        if (this.isAlive() && !hasPurpurRider() && ((this.isInDaylight() && (shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight)) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur
+-        if (this.isAlive() && (((shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight) && this.isInDaylight()) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur
++        if (this.isAlive() && !hasPurpurRider() && (((shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight) && this.isInDaylight()) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur
              this.setOnFire(8);
          }
  
diff --git a/patches/server/0150-Configurable-entity-base-attributes.patch b/patches/server/0150-Configurable-entity-base-attributes.patch
index 39e8dd72f..6d35e5ea1 100644
--- a/patches/server/0150-Configurable-entity-base-attributes.patch
+++ b/patches/server/0150-Configurable-entity-base-attributes.patch
@@ -905,7 +905,7 @@ index 15ed51a2746c09538a425fce25fa25f2619b7033..626a207cdb727866cb75f4e53a688086
  
      public static AttributeProvider.Builder m() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
-index 851dc37d96d11f3f64b4eb373344e0c11a356540..5320368305f46399d63e2585d3411ff8c45582ad 100644
+index 1ea3054cebbf32588219f8915f9fb496495e3a10..437d602cf4a0da52fc61a50321d795290eea11bf 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 @@ -120,6 +120,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
diff --git a/patches/server/0151-Phantom-flames-on-swoop.patch b/patches/server/0151-Phantom-flames-on-swoop.patch
index f0908b0b3..574a9b309 100644
--- a/patches/server/0151-Phantom-flames-on-swoop.patch
+++ b/patches/server/0151-Phantom-flames-on-swoop.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantom flames on swoop
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
-index 5320368305f46399d63e2585d3411ff8c45582ad..f6e09812b2c39f70d23100e73dce59fd5c1caa43 100644
+index 437d602cf4a0da52fc61a50321d795290eea11bf..fe07d9798eaae670e218d25fe23256c87c41d686 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 @@ -226,6 +226,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {