Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

1 files changed, 0 insertions, 32 deletions

diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 7686ff66ae8..dd526162e66 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -63,7 +63,6 @@ public:
         static ChatCommand npcSetCommandTable[] =
         {
             { "allowmove",      SEC_ADMINISTRATOR,  false, &HandleNpcSetAllowMovementCommand,  "", NULL },
-            { "deathstate",     SEC_GAMEMASTER,     false, &HandleNpcSetDeathStateCommand,     "", NULL },
             { "entry",          SEC_ADMINISTRATOR,  false, &HandleNpcSetEntryCommand,          "", NULL },
             { "factionid",      SEC_GAMEMASTER,     false, &HandleNpcSetFactionIdCommand,      "", NULL },
             { "flag",           SEC_GAMEMASTER,     false, &HandleNpcSetFlagCommand,           "", NULL },
@@ -1157,37 +1156,6 @@ public:
         return true;
     }
 
-    //npc deathstate handling
-    static bool HandleNpcSetDeathStateCommand(ChatHandler* handler, const char* args)
-    {
-        if (!*args)
-            return false;
-
-        Creature* pCreature = handler->getSelectedCreature();
-        if (!pCreature || pCreature->isPet())
-        {
-            handler->SendSysMessage(LANG_SELECT_CREATURE);
-            handler->SetSentErrorMessage(true);
-            return false;
-        }
-
-        if (strncmp(args, "on", 3) == 0)
-            pCreature->SetDeadByDefault(true);
-        else if (strncmp(args, "off", 4) == 0)
-            pCreature->SetDeadByDefault(false);
-        else
-        {
-            handler->SendSysMessage(LANG_USE_BOL);
-            handler->SetSentErrorMessage(true);
-            return false;
-        }
-
-        pCreature->SaveToDB();
-        pCreature->Respawn();
-
-        return true;
-    }
-
     static bool HandleNpcAddFormationCommand(ChatHandler* handler, const char* args)
     {
         if (!*args)