Core/Players: Fixed DK runes and runic power

Closes #19595

2 files changed, 4 insertions, 10 deletions

diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index be836943087..fd5170a01a5 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -1006,13 +1006,6 @@ public:
             return false;
 
         Player* target = handler->getSelectedPlayerOrSelf();
-        if (!target)
-        {
-            handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
-            handler->SetSentErrorMessage(true);
-            return false;
-        }
-
         if (handler->HasLowerSecurity(target, ObjectGuid::Empty))
             return false;
 
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index 0edaa189e8e..a12305168c2 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -91,11 +91,12 @@ public:
         {
             if (Unit* caster = eventInfo.GetActor())
             {
-                if (caster->GetTypeId() != TYPEID_PLAYER || caster->getClass() != CLASS_DEATH_KNIGHT)
+                Player* player = caster->ToPlayer();
+                if (!player  || caster->getClass() != CLASS_DEATH_KNIGHT)
                     return false;
 
-                for (uint8 i = 0; i < MAX_RUNES; ++i)
-                    if (caster->ToPlayer()->GetRuneCooldown(i) == 0)
+                for (uint8 i = 0; i < player->GetMaxPower(POWER_RUNES); ++i)
+                    if (player->GetRuneCooldown(i) == 0)
                         return false;
 
                 return true;