diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
index d16918367..763e79fe3 100644
--- a/src/server/game/AI/CreatureAIImpl.h
+++ b/src/server/game/AI/CreatureAIImpl.h
@@ -12,292 +12,14 @@
 #include "CreatureAI.h"
 #include "SpellMgr.h"
 
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2)
-{
-    return (urand(0, 1)) ? v1 : v2;
-}
+#include <functional>
+#include <type_traits>
 
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3)
+template<typename First, typename Second, typename... Rest>
+static inline First const& RAND(First const& first, Second const& second, Rest const&... rest)
 {
-    switch (urand(0, 2))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4)
-{
-    switch (urand(0, 3))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5)
-{
-    switch (urand(0, 4))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6)
-{
-    switch (urand(0, 5))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7)
-{
-    switch (urand(0, 6))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8)
-{
-    switch (urand(0, 7))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-        case 7: return v8;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
-              const T& v9)
-{
-    switch (urand(0, 8))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-        case 7: return v8;
-        case 8: return v9;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
-              const T& v9, const T& v10)
-{
-    switch (urand(0, 9))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-        case 7: return v8;
-        case 8: return v9;
-        case 9: return v10;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
-              const T& v9, const T& v10, const T& v11)
-{
-    switch (urand(0, 10))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-        case 7: return v8;
-        case 8: return v9;
-        case 9: return v10;
-        case 10: return v11;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
-              const T& v9, const T& v10, const T& v11, const T& v12)
-{
-    switch (urand(0, 11))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-        case 7: return v8;
-        case 8: return v9;
-        case 9: return v10;
-        case 10: return v11;
-        case 11: return v12;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
-              const T& v9, const T& v10, const T& v11, const T& v12, const T& v13)
-{
-    switch (urand(0, 12))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-        case 7: return v8;
-        case 8: return v9;
-        case 9: return v10;
-        case 10: return v11;
-        case 11: return v12;
-        case 12: return v13;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
-              const T& v9, const T& v10, const T& v11, const T& v12, const T& v13, const T& v14)
-{
-    switch (urand(0, 13))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-        case 7: return v8;
-        case 8: return v9;
-        case 9: return v10;
-        case 10: return v11;
-        case 11: return v12;
-        case 12: return v13;
-        case 13: return v14;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
-              const T& v9, const T& v10, const T& v11, const T& v12, const T& v13, const T& v14, const T& v15)
-{
-    switch (urand(0, 14))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-        case 7: return v8;
-        case 8: return v9;
-        case 9: return v10;
-        case 10: return v11;
-        case 11: return v12;
-        case 12: return v13;
-        case 13: return v14;
-        case 14: return v15;
-    }
-}
-
-template<class T>
-inline
-const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
-              const T& v9, const T& v10, const T& v11, const T& v12, const T& v13, const T& v14, const T& v15, const T& v16)
-{
-    switch (urand(0, 15))
-    {
-        default:
-        case 0: return v1;
-        case 1: return v2;
-        case 2: return v3;
-        case 3: return v4;
-        case 4: return v5;
-        case 5: return v6;
-        case 6: return v7;
-        case 7: return v8;
-        case 8: return v9;
-        case 9: return v10;
-        case 10: return v11;
-        case 11: return v12;
-        case 12: return v13;
-        case 13: return v14;
-        case 14: return v15;
-        case 15: return v16;
-    }
+    std::reference_wrapper<typename std::add_const<First>::type> const pack[] = { first, second, rest... };
+    return pack[urand(0, sizeof...(rest) + 1)].get();
 }
 
 enum AITarget
diff --git a/src/server/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp
index 84f53a63f..3d9c38cb1 100644
--- a/src/server/scripts/Events/winter_veil.cpp
+++ b/src/server/scripts/Events/winter_veil.cpp
@@ -85,9 +85,9 @@ class spell_winter_wondervolt_trap : public SpellScriptLoader
 
                 uint32 spellId = 0;
                 if (target->getGender() == GENDER_MALE)
-                    spellId = RAND<uint32>(SPELL_WINTER_WONDERVOLT_RED_MAN, SPELL_WINTER_WONDERVOLT_GREEN_MAN);
+                    spellId = RAND(SPELL_WINTER_WONDERVOLT_RED_MAN, SPELL_WINTER_WONDERVOLT_GREEN_MAN);
                 else
-                    spellId = RAND<uint32>(SPELL_WINTER_WONDERVOLT_RED_WOMEN, SPELL_WINTER_WONDERVOLT_GREEN_WOMEN);
+                    spellId = RAND(SPELL_WINTER_WONDERVOLT_RED_WOMEN, SPELL_WINTER_WONDERVOLT_GREEN_WOMEN);
 
                 // cast
                 target->CastSpell(target, spellId, true);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index f95c81087..b399bfb25 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
@@ -798,7 +798,7 @@ class boss_prince_valanar_icc : public CreatureScript
                 DoAction(ACTION_CAST_INVOCATION);
                 currentInvocationIndex = 0;
                 invocationOrder[0] = DATA_PRINCE_VALANAR_GUID;
-                invocationOrder[1] = RAND<uint32>(DATA_PRINCE_KELESETH_GUID, DATA_PRINCE_TALDARAM_GUID);
+                invocationOrder[1] = RAND(DATA_PRINCE_KELESETH_GUID, DATA_PRINCE_TALDARAM_GUID);
                 invocationOrder[2] = DATA_PRINCE_KELESETH_GUID + DATA_PRINCE_TALDARAM_GUID - invocationOrder[1];
 
                 events.ScheduleEvent(EVENT_BERSERK, 600000);