Merge pull request #4839 from Fredi/reload

Core/Commands: Implement reload multiple creature templates

src/server/scripts/Commands/cs_reload.cpp

@@ -404,21 +404,23 @@ public:
         if (!*args)
             return false;
 
-        uint32 entry = (uint32) atoi((char*)args);
+        Tokens entries(std::string(args), ' ');
+
+        for (Tokens::const_iterator itr = entries.begin(); itr != entries.end(); ++itr)
+        {
+            uint32 entry = uint32(atoi(*itr));
             QueryResult result = WorldDatabase.PQuery("SELECT difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction_A, faction_H, npcflag, speed_walk, speed_run, scale, rank, mindmg, maxdmg, dmgschool, attackpower, dmg_multiplier, baseattacktime, rangeattacktime, unit_class, unit_flags, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, minrangedmg, maxrangedmg, rangedattackpower, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, InhabitType, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, questItem6, movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName FROM creature_template WHERE entry = %u", entry);
             if (!result)
             {
                 handler->PSendSysMessage(LANG_COMMAND_CREATURETEMPLATE_NOTFOUND, entry);
-            handler->SetSentErrorMessage(true);
+                continue;
-            return false;
             }
 
             CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(entry);
             if (!cInfo)
             {
                 handler->PSendSysMessage(LANG_COMMAND_CREATURESTORAGE_NOTFOUND, entry);
-            handler->SetSentErrorMessage(true);
+                continue;
-            return false;
             }
 
             sLog->outString("Reloading creature template entry %u", entry);
@@ -510,6 +512,7 @@ public:
             const_cast<CreatureTemplate*>(cInfo)->ScriptID = sObjectMgr->GetScriptId(fields[82].GetCString());
 
             sObjectMgr->CheckCreatureTemplate(cInfo);
+        }
 
         handler->SendGlobalGMSysMessage("Creature template reloaded.");
         return true;