Core: Update to 10.2.0

Port From (https://github.com/TrinityCore/TrinityCore/commit/1eea1d11b14d2ae065ab0f1888fba3b1ef03874f)
2024-02-02 21:49:02 -05:00
parent 75201f56ce
commit 4b669cfb5d
45 changed files with 1742 additions and 1273 deletions
@@ -3539,9 +3539,14 @@ namespace Game.Guilds

            public bool ValidateEmblemColors()
            {
-                return CliDB.GuildColorBackgroundStorage.ContainsKey(m_backgroundColor) &&
-                       CliDB.GuildColorBorderStorage.ContainsKey(m_borderColor) &&
-                       CliDB.GuildColorEmblemStorage.ContainsKey(m_color);
+                return ValidateEmblemColors(m_style, m_color, m_borderStyle, m_borderColor, m_backgroundColor);
+            }
+            
+            public static bool ValidateEmblemColors(uint style, uint color, uint borderStyle, uint borderColor, uint backgroundColor)
+            {
+                return CliDB.GuildColorBackgroundStorage.ContainsKey(backgroundColor) &&
+                       CliDB.GuildColorBorderStorage.ContainsKey(borderColor) &&
+                       CliDB.GuildColorEmblemStorage.ContainsKey(color);
            }

            public bool LoadFromDB(SQLFields field)