Fix black glow on dungeon mobs when Class-Based Player Glow is enabled (#1540)

2 files changed, 11 insertions, 2 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonClass.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonClass.java
index aeb0d171..65e73345 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonClass.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonClass.java
@@ -23,11 +23,13 @@ public enum DungeonClass {
 
 	private final String name;
 	private final int color;
+	private final int glowColor;
 	private final ItemStack icon;
 
 	DungeonClass(String name, int color, ItemStack icon) {
 		this.name = name;
 		this.color = ColorHelper.fullAlpha(color);
+		this.glowColor = color;
 		this.icon = icon;
 	}
 
@@ -36,12 +38,19 @@ public enum DungeonClass {
 	}
 
 	/**
-	 * @return The color of the class in RGB format.
+	 * @return The color of the class in ARGB format.
 	 */
 	public int color() {
 		return this.color;
 	}
 
+	/**
+	 * @return The color of the class in RGB format.
+	 */
+	public int glowColor() {
+		return this.glowColor;
+	}
+
 	public ItemStack icon() {
 		return icon;
 	}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/entity/glow/adder/DungeonGlowAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/entity/glow/adder/DungeonGlowAdder.java
index 13ef6afd..27fea99c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/entity/glow/adder/DungeonGlowAdder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/entity/glow/adder/DungeonGlowAdder.java
@@ -65,7 +65,7 @@ public class DungeonGlowAdder extends MobGlowAdder {
 
 			//Class-based glow
 			//This goes after regular mobs to ensure starred player entities like dreadlords have the glow applied
-			case PlayerEntity p when SkyblockerConfigManager.get().dungeons.classBasedPlayerGlow && DungeonScore.isDungeonStarted() -> DungeonPlayerManager.getClassFromPlayer(p).color();
+			case PlayerEntity p when SkyblockerConfigManager.get().dungeons.classBasedPlayerGlow && DungeonScore.isDungeonStarted() -> DungeonPlayerManager.getClassFromPlayer(p).glowColor();
 
 			default -> NO_GLOW;
 		};