From 9e22d7f688aaa8cd4f602911a725949f38e704a0 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 16 Mar 2023 19:27:57 +1100 Subject: [PATCH] SPIGOT-7292: Support alpha channel in Display entities By: Doc --- .../main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java | 4 ++-- .../java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java index 0e7d587ba..0cf287b7a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java @@ -128,7 +128,7 @@ public class CraftDisplay extends CraftEntity implements Display { public Color getGlowColorOverride() { int color = getHandle().getGlowColorOverride(); - return (color == -1) ? null : Color.fromRGB(color); + return (color == -1) ? null : Color.fromARGB(color); } @Override @@ -136,7 +136,7 @@ public class CraftDisplay extends CraftEntity implements Display { if (color == null) { getHandle().setGlowColorOverride(-1); } else { - getHandle().setGlowColorOverride(color.asRGB()); + getHandle().setGlowColorOverride(color.asARGB()); } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java index ff7775887..1dfe22b11 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java @@ -53,7 +53,7 @@ public class CraftTextDisplay extends CraftDisplay implements TextDisplay { public Color getBackgroundColor() { int color = getHandle().getBackgroundColor(); - return (color == -1) ? null : Color.fromRGB(color); + return (color == -1) ? null : Color.fromARGB(color); } @Override @@ -61,7 +61,7 @@ public class CraftTextDisplay extends CraftDisplay implements TextDisplay { if (color == null) { getHandle().setBackgroundColor(-1); } else { - getHandle().setBackgroundColor(color.asRGB()); + getHandle().setBackgroundColor(color.asARGB()); } }