From d4472f85a57a13a9ddd90b877cca977d18be5dee Mon Sep 17 00:00:00 2001
From: Jiralite <33201955+Jiralite@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:42:16 +0000
Subject: [PATCH] refactor(resolveColor): Prioritise number type check (#10116)

* refactor(resolveColor): prioritise number type check

* refactor: prefer `!Number.isInteger()`

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 packages/discord.js/src/util/Util.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/discord.js/src/util/Util.js b/packages/discord.js/src/util/Util.js
index 38b0f7fbb..9e7d1b773 100644
--- a/packages/discord.js/src/util/Util.js
+++ b/packages/discord.js/src/util/Util.js
@@ -289,12 +289,12 @@ function resolveColor(color) {
     resolvedColor = (color[0] << 16) + (color[1] << 8) + color[2];
   }
 
-  if (resolvedColor < 0 || resolvedColor > 0xffffff) {
-    throw new DiscordjsRangeError(ErrorCodes.ColorRange);
+  if (!Number.isInteger(resolvedColor)) {
+    throw new DiscordjsTypeError(ErrorCodes.ColorConvert, color);
   }
 
-  if (typeof resolvedColor !== 'number' || Number.isNaN(resolvedColor)) {
-    throw new DiscordjsTypeError(ErrorCodes.ColorConvert, color);
+  if (resolvedColor < 0 || resolvedColor > 0xffffff) {
+    throw new DiscordjsRangeError(ErrorCodes.ColorRange);
   }
 
   return resolvedColor;