From bd9e2e7fe80f584decbe8038c565838e4db7cbc0 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:55:29 +0200
Subject: [PATCH] Handle alpha channel from potion_contents component (#10808)

---
 patches/api/Fix-upstream-javadocs.patch  |  4 +-
 patches/server/More-Projectile-API.patch | 75 ++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch
index 6780cc4186..b5d5b5c0a8 100644
--- a/patches/api/Fix-upstream-javadocs.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -1581,7 +1581,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 - * Material#LEATHER_CHESTPLATE}, {@link Material#LEATHER_HELMET}, or {@link
 - * Material#LEATHER_LEGGINGS}) that can be colored.
 + * Material#LEATHER_LEGGINGS}, {@link Material#LEATHER_CHESTPLATE}, {@link
-+ * Material#LEATHER_HELMET}, {@link Material#LEATHER_HORSE_ARMOR}, {@link
++ * Material#LEATHER_HELMET}, {@link Material#LEATHER_HORSE_ARMOR} or {@link
 + * Material#WOLF_ARMOR}) that can be colored.
   */
  public interface LeatherArmorMeta extends ItemMeta {
@@ -1592,7 +1592,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @return the color of the armor, never null
 +     * @apiNote The method yielding {@link ItemFactory#getDefaultLeatherColor()} is incorrect
 +     * for {@link Material#WOLF_ARMOR} as its default color differs. Generally, it is recommended to check
-+     * {@link #isDyed()} to determined if this leather armor is dyed than to compare this colour to the default.
++     * {@link #isDyed()} to determine if this leather armor is dyed than to compare this color to the default.
       */
      @NotNull
      Color getColor();
diff --git a/patches/server/More-Projectile-API.patch b/patches/server/More-Projectile-API.patch
index ef2647c93b..525e080e41 100644
--- a/patches/server/More-Projectile-API.patch
+++ b/patches/server/More-Projectile-API.patch
@@ -13,6 +13,7 @@ public net.minecraft.world.entity.projectile.ShulkerBullet currentMoveDirection
 public net.minecraft.world.entity.projectile.ShulkerBullet flightSteps
 public net.minecraft.world.entity.projectile.AbstractArrow soundEvent
 public net.minecraft.world.entity.projectile.ThrownTrident dealtDamage
+public net.minecraft.world.entity.projectile.Arrow NO_EFFECT_COLOR
 public net.minecraft.world.entity.projectile.Projectile hasBeenShot
 public net.minecraft.world.entity.projectile.Projectile leftOwner
 public net.minecraft.world.entity.projectile.Projectile preOnHit(Lnet/minecraft/world/phys/HitResult;)V
@@ -231,6 +232,80 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
+@@ -0,0 +0,0 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud
+ 
+     @Override
+     public Color getColor() {
+-        return Color.fromRGB(this.getHandle().potionContents.getColor());
++        return Color.fromRGB(this.getHandle().potionContents.getColor() & 0x00FFFFFF); // Paper - skip alpha channel
+     }
+ 
+     @Override
+@@ -0,0 +0,0 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud
+             this.removeCustomEffect(effect.getType());
+         }
+         this.getHandle().addEffect(CraftPotionUtil.fromBukkit(effect));
+-        this.getHandle().updateColor();
++        // this.getHandle().updateColor(); // Paper - already done above
+         return true;
+     }
+ 
+@@ -0,0 +0,0 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud
+     public void clearCustomEffects() {
+         PotionContents old = this.getHandle().potionContents;
+         this.getHandle().setPotionContents(new PotionContents(old.potion(), old.customColor(), List.of()));
+-        this.getHandle().updateColor();
++        // this.getHandle().updateColor(); // Paper - already done above
+     }
+ 
+     @Override
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+@@ -0,0 +0,0 @@ public class CraftArrow extends CraftAbstractArrow implements Arrow {
+             this.removeCustomEffect(effect.getType());
+         }
+         this.getHandle().addEffect(CraftPotionUtil.fromBukkit(effect));
+-        this.getHandle().updateColor();
++        // this.getHandle().updateColor(); // Paper - already done above
+         return true;
+     }
+ 
+@@ -0,0 +0,0 @@ public class CraftArrow extends CraftAbstractArrow implements Arrow {
+     public void clearCustomEffects() {
+         PotionContents old = this.getHandle().getPotionContents();
+         this.getHandle().setPotionContents(new PotionContents(old.potion(), old.customColor(), List.of()));
+-        this.getHandle().updateColor();
++        // this.getHandle().updateColor(); // Paper - already done above
+     }
+ 
+     @Override
+@@ -0,0 +0,0 @@ public class CraftArrow extends CraftAbstractArrow implements Arrow {
+ 
+     @Override
+     public void setColor(Color color) {
+-        int colorRGB = (color == null) ? -1 : color.asRGB();
++        int colorRGB = (color == null) ? net.minecraft.world.entity.projectile.Arrow.NO_EFFECT_COLOR : color.asARGB(); // Paper
+         PotionContents old = this.getHandle().getPotionContents();
+         this.getHandle().setPotionContents(new PotionContents(old.potion(), Optional.of(colorRGB), old.customEffects()));
+     }
+ 
+     @Override
+     public Color getColor() {
+-        if (this.getHandle().getColor() <= -1) {
++        int color = this.getHandle().getColor(); // Paper
++        if (color == net.minecraft.world.entity.projectile.Arrow.NO_EFFECT_COLOR) { // Paper
+             return null;
+         }
+-        return Color.fromRGB(this.getHandle().getColor());
++        return Color.fromARGB(color); // Paper
+     }
+ }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java