Merge branch 'master' into 4.x
Conflicts: src/server/authserver/Server/AuthSocket.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Miscellaneous/SharedDefines.h src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp
This commit is contained in:
commit
37b66384f3
491 files changed
+15328
-4368
No files matched your search
@@ -109,7 +109,8 @@ public:
|
||||
{
|
||||
case AOR_OK:
|
||||
handler->PSendSysMessage(LANG_ACCOUNT_CREATED, accountName);
|
||||
sLog->outChar("Account: %d (IP: %s) Character:[%s] (GUID: %u) Change Password.", handler->GetSession()->GetAccountId(),handler->GetSession()->GetRemoteAddress().c_str(), handler->GetSession()->GetPlayer()->GetName(), handler->GetSession()->GetPlayer()->GetGUIDLow());
|
||||
if (handler->GetSession())
|
||||
sLog->outChar("Account: %d (IP: %s) Character:[%s] (GUID: %u) Change Password.", handler->GetSession()->GetAccountId(),handler->GetSession()->GetRemoteAddress().c_str(), handler->GetSession()->GetPlayer()->GetName(), handler->GetSession()->GetPlayer()->GetGUIDLow());
|
||||
break;
|
||||
case AOR_NAME_TOO_LONG:
|
||||
handler->SendSysMessage(LANG_ACCOUNT_TOO_LONG);
|
||||
@@ -509,7 +510,7 @@ public:
|
||||
|
||||
stmt->setUInt32(0, targetAccountId);
|
||||
stmt->setUInt8(1, uint8(gm));
|
||||
stmt->setUInt32(2, gmRealmID);
|
||||
stmt->setInt32(2, gmRealmID);
|
||||
|
||||
LoginDatabase.Execute(stmt);
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ EndScriptData */
|
||||
#include "ObjectMgr.h"
|
||||
#include "Chat.h"
|
||||
#include "AccountMgr.h"
|
||||
#include "World.h"
|
||||
|
||||
class gm_commandscript : public CommandScript
|
||||
{
|
||||
@@ -152,7 +153,7 @@ public:
|
||||
static bool HandleGMListFullCommand(ChatHandler* handler, char const* /*args*/)
|
||||
{
|
||||
///- Get the accounts with GM Level >0
|
||||
QueryResult result = LoginDatabase.PQuery("SELECT a.username, aa.gmlevel FROM account a, account_access aa WHERE a.id=aa.id AND aa.gmlevel >= %u", SEC_MODERATOR);
|
||||
QueryResult result = LoginDatabase.PQuery("SELECT a.username, aa.gmlevel FROM account a, account_access aa WHERE a.id=aa.id AND aa.gmlevel >= %u AND (aa.realmid = -1 OR aa.realmid = %u)", SEC_MODERATOR, realmID);
|
||||
if (result)
|
||||
{
|
||||
handler->SendSysMessage(LANG_GMLIST);
|
||||
|
||||
@@ -97,7 +97,7 @@ public:
|
||||
|
||||
// Activate
|
||||
object->SetLootState(GO_READY);
|
||||
object->UseDoorOrButton(10000);
|
||||
object->UseDoorOrButton(10000, false, handler->GetSession()->GetPlayer());
|
||||
|
||||
handler->PSendSysMessage("Object activated!");
|
||||
|
||||
|
||||
@@ -130,7 +130,7 @@ public:
|
||||
{
|
||||
uint32 tguid = chr->GetTransport()->AddNPCPassenger(0, id, chr->GetTransOffsetX(), chr->GetTransOffsetY(), chr->GetTransOffsetZ(), chr->GetTransOffsetO());
|
||||
if (tguid > 0)
|
||||
WorldDatabase.PQuery("INSERT INTO creature_transport (guid, npc_entry, transport_entry, TransOffsetX, TransOffsetY, TransOffsetZ, TransOffsetO) values (%u, %u, %f, %f, %f, %f, %u)", tguid, id, chr->GetTransport()->GetEntry(), chr->GetTransOffsetX(), chr->GetTransOffsetY(), chr->GetTransOffsetZ(), chr->GetTransOffsetO());
|
||||
WorldDatabase.PExecute("INSERT INTO creature_transport (guid, npc_entry, transport_entry, TransOffsetX, TransOffsetY, TransOffsetZ, TransOffsetO) values (%u, %u, %f, %f, %f, %f, %u)", tguid, id, chr->GetTransport()->GetEntry(), chr->GetTransOffsetX(), chr->GetTransOffsetY(), chr->GetTransOffsetZ(), chr->GetTransOffsetO());
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -679,7 +679,7 @@ public:
|
||||
|
||||
if (target->GetTransport())
|
||||
if (target->GetGUIDTransport())
|
||||
WorldDatabase.PQuery("UPDATE creature_transport SET emote=%u WHERE transport_entry=%u AND guid=%u", emote, target->GetTransport()->GetEntry(), target->GetGUIDTransport());
|
||||
WorldDatabase.PExecute("UPDATE creature_transport SET emote=%u WHERE transport_entry=%u AND guid=%u", emote, target->GetTransport()->GetEntry(), target->GetGUIDTransport());
|
||||
|
||||
target->SetUInt32Value(UNIT_NPC_EMOTESTATE, emote);
|
||||
|
||||
@@ -1036,15 +1036,14 @@ public:
|
||||
}
|
||||
|
||||
if (/*creature->GetMotionMaster()->empty() ||*/
|
||||
creature->GetMotionMaster()->GetCurrentMovementGeneratorType () != TARGETED_MOTION_TYPE)
|
||||
creature->GetMotionMaster()->GetCurrentMovementGeneratorType () != FOLLOW_MOTION_TYPE)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU, creature->GetName());
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
TargetedMovementGenerator<Creature> const* mgen
|
||||
= static_cast<TargetedMovementGenerator<Creature> const*>((creature->GetMotionMaster()->top()));
|
||||
FollowMovementGenerator<Creature> const* mgen = static_cast<FollowMovementGenerator<Creature> const*>((creature->GetMotionMaster()->top()));
|
||||
|
||||
if (mgen->GetTarget() != player)
|
||||
{
|
||||
|
||||
@@ -404,113 +404,116 @@ public:
|
||||
if (!*args)
|
||||
return false;
|
||||
|
||||
uint32 entry = (uint32) atoi((char*)args);
|
||||
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)
|
||||
Tokens entries(std::string(args), ' ');
|
||||
|
||||
for (Tokens::const_iterator itr = entries.begin(); itr != entries.end(); ++itr)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_CREATURETEMPLATE_NOTFOUND, entry);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
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);
|
||||
continue;
|
||||
}
|
||||
|
||||
CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(entry);
|
||||
if (!cInfo)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_CREATURESTORAGE_NOTFOUND, entry);
|
||||
continue;
|
||||
}
|
||||
|
||||
sLog->outString("Reloading creature template entry %u", entry);
|
||||
|
||||
Field* fields = result->Fetch();
|
||||
|
||||
const_cast<CreatureTemplate*>(cInfo)->DifficultyEntry[0] = fields[0].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->DifficultyEntry[1] = fields[1].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->DifficultyEntry[2] = fields[2].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->KillCredit[0] = fields[3].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->KillCredit[1] = fields[4].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Modelid1 = fields[5].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Modelid2 = fields[6].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Modelid3 = fields[7].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Modelid4 = fields[8].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Name = fields[9].GetString();
|
||||
const_cast<CreatureTemplate*>(cInfo)->SubName = fields[10].GetString();
|
||||
const_cast<CreatureTemplate*>(cInfo)->IconName = fields[11].GetString();
|
||||
const_cast<CreatureTemplate*>(cInfo)->GossipMenuId = fields[12].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->minlevel = fields[13].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->maxlevel = fields[14].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->expansion = fields[15].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->faction_A = fields[16].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->faction_H = fields[17].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->npcflag = fields[18].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->speed_walk = fields[19].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->speed_run = fields[20].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->scale = fields[21].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->rank = fields[22].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->mindmg = fields[23].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->maxdmg = fields[24].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->dmgschool = fields[25].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->attackpower = fields[26].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->dmg_multiplier = fields[27].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->baseattacktime = fields[28].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->rangeattacktime = fields[29].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->unit_class = fields[30].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->unit_flags = fields[31].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->dynamicflags = fields[32].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->family = fields[33].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->trainer_type = fields[34].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->trainer_spell = fields[35].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->trainer_class = fields[36].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->trainer_race = fields[37].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->minrangedmg = fields[38].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->maxrangedmg = fields[39].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->rangedattackpower = fields[40].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->type = fields[41].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->type_flags = fields[42].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->lootid = fields[43].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->pickpocketLootId = fields[44].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->SkinLootId = fields[45].GetUInt32();
|
||||
|
||||
for (uint8 i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
|
||||
{
|
||||
const_cast<CreatureTemplate*>(cInfo)->resistance[i] = fields[46 + i -1].GetUInt32();
|
||||
}
|
||||
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[0] = fields[52].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[1] = fields[53].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[2] = fields[54].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[3] = fields[55].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[4] = fields[56].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[5] = fields[57].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[6] = fields[58].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[7] = fields[59].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->PetSpellDataId = fields[60].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->VehicleId = fields[61].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->mingold = fields[62].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->maxgold = fields[63].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->AIName = fields[64].GetString();
|
||||
const_cast<CreatureTemplate*>(cInfo)->MovementType = fields[65].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->InhabitType = fields[66].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->ModHealth = fields[67].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->ModMana = fields[68].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->ModArmor = fields[69].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->RacialLeader = fields[70].GetBool();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[0] = fields[71].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[1] = fields[72].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[2] = fields[73].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[3] = fields[74].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[4] = fields[75].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[5] = fields[76].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->movementId = fields[77].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->RegenHealth = fields[78].GetBool();
|
||||
const_cast<CreatureTemplate*>(cInfo)->equipmentId = fields[79].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->MechanicImmuneMask = fields[80].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->flags_extra = fields[81].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->ScriptID = sObjectMgr->GetScriptId(fields[82].GetCString());
|
||||
|
||||
sObjectMgr->CheckCreatureTemplate(cInfo);
|
||||
}
|
||||
|
||||
CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(entry);
|
||||
if (!cInfo)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_CREATURESTORAGE_NOTFOUND, entry);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
sLog->outString("Reloading creature template entry %u", entry);
|
||||
|
||||
Field* fields = result->Fetch();
|
||||
|
||||
const_cast<CreatureTemplate*>(cInfo)->DifficultyEntry[0] = fields[0].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->DifficultyEntry[1] = fields[1].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->DifficultyEntry[2] = fields[2].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->KillCredit[0] = fields[3].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->KillCredit[1] = fields[4].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Modelid1 = fields[5].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Modelid2 = fields[6].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Modelid3 = fields[7].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Modelid4 = fields[8].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->Name = fields[9].GetString();
|
||||
const_cast<CreatureTemplate*>(cInfo)->SubName = fields[10].GetString();
|
||||
const_cast<CreatureTemplate*>(cInfo)->IconName = fields[11].GetString();
|
||||
const_cast<CreatureTemplate*>(cInfo)->GossipMenuId = fields[12].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->minlevel = fields[13].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->maxlevel = fields[14].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->expansion = fields[15].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->faction_A = fields[16].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->faction_H = fields[17].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->npcflag = fields[18].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->speed_walk = fields[19].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->speed_run = fields[20].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->scale = fields[21].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->rank = fields[22].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->mindmg = fields[23].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->maxdmg = fields[24].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->dmgschool = fields[25].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->attackpower = fields[26].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->dmg_multiplier = fields[27].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->baseattacktime = fields[28].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->rangeattacktime = fields[29].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->unit_class = fields[30].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->unit_flags = fields[31].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->dynamicflags = fields[32].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->family = fields[33].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->trainer_type = fields[34].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->trainer_spell = fields[35].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->trainer_class = fields[36].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->trainer_race = fields[37].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->minrangedmg = fields[38].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->maxrangedmg = fields[39].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->rangedattackpower = fields[40].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->type = fields[41].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->type_flags = fields[42].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->lootid = fields[43].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->pickpocketLootId = fields[44].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->SkinLootId = fields[45].GetUInt32();
|
||||
|
||||
for (uint8 i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
|
||||
{
|
||||
const_cast<CreatureTemplate*>(cInfo)->resistance[i] = fields[46 + i -1].GetUInt32();
|
||||
}
|
||||
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[0] = fields[52].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[1] = fields[53].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[2] = fields[54].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[3] = fields[55].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[4] = fields[56].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[5] = fields[57].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[6] = fields[58].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->spells[7] = fields[59].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->PetSpellDataId = fields[60].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->VehicleId = fields[61].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->mingold = fields[62].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->maxgold = fields[63].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->AIName = fields[64].GetString();
|
||||
const_cast<CreatureTemplate*>(cInfo)->MovementType = fields[65].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->InhabitType = fields[66].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->ModHealth = fields[67].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->ModMana = fields[68].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->ModArmor = fields[69].GetFloat();
|
||||
const_cast<CreatureTemplate*>(cInfo)->RacialLeader = fields[70].GetBool();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[0] = fields[71].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[1] = fields[72].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[2] = fields[73].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[3] = fields[74].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[4] = fields[75].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->questItems[5] = fields[76].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->movementId = fields[77].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->RegenHealth = fields[78].GetBool();
|
||||
const_cast<CreatureTemplate*>(cInfo)->equipmentId = fields[79].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->MechanicImmuneMask = fields[80].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->flags_extra = fields[81].GetUInt32();
|
||||
const_cast<CreatureTemplate*>(cInfo)->ScriptID = sObjectMgr->GetScriptId(fields[82].GetCString());
|
||||
|
||||
sObjectMgr->CheckCreatureTemplate(cInfo);
|
||||
|
||||
handler->SendGlobalGMSysMessage("Creature template reloaded.");
|
||||
return true;
|
||||
}
|
||||
@@ -989,7 +992,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool HandleReloadWpCommand(ChatHandler* handler, const char* args)
|
||||
static bool HandleReloadWpCommand(ChatHandler* /*handler*/, const char* args)
|
||||
{
|
||||
if (*args != 'a')
|
||||
sLog->outString("Re-Loading Waypoints data from 'waypoints_data'");
|
||||
|
||||
Reference in new issue
Block a user