josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some missing changes. This should fix the bug that loading char causes crash.

Browse Source 
Please do not commit to the other tip (I do not know how to delete it).

--HG--
branch : trunk
This commit is contained in:
megamage
2008-11-20 17:40:13 -06:00
parent 1e997b95cc
commit e5e6ff9f1b
12 changed files with 124 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/CharacterHandler.cpp
+33 -29
View File
@@ -64,7 +64,7 @@ bool LoginQueryHolder::Initialize()
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADFROM, "SELECT guid, account, data, name, race, class, position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty FROM characters WHERE guid = '%u'", GUID_LOPART(m_guid)); res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADFROM, "SELECT guid, account, data, name, race, class, position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty FROM characters WHERE guid = '%u'", GUID_LOPART(m_guid));
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADGROUP, "SELECT leaderGuid FROM group_member WHERE memberGuid ='%u'", GUID_LOPART(m_guid)); res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADGROUP, "SELECT leaderGuid FROM group_member WHERE memberGuid ='%u'", GUID_LOPART(m_guid));
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES, "SELECT id, permanent, map, difficulty, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = '%u'", GUID_LOPART(m_guid)); res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES, "SELECT id, permanent, map, difficulty, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = '%u'", GUID_LOPART(m_guid));
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADAURAS, "SELECT caster_guid,spell,effect_index,amount,maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'", GUID_LOPART(m_guid)); res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADAURAS, "SELECT caster_guid,spell,effect_index,stackcount,amount,maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'", GUID_LOPART(m_guid));
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADSPELLS, "SELECT spell,slot,active,disabled FROM character_spell WHERE guid = '%u'", GUID_LOPART(m_guid)); res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADSPELLS, "SELECT spell,slot,active,disabled FROM character_spell WHERE guid = '%u'", GUID_LOPART(m_guid));
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADQUESTSTATUS, "SELECT quest,status,rewarded,explored,timer,mobcount1,mobcount2,mobcount3,mobcount4,itemcount1,itemcount2,itemcount3,itemcount4 FROM character_queststatus WHERE guid = '%u'", GUID_LOPART(m_guid)); res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADQUESTSTATUS, "SELECT quest,status,rewarded,explored,timer,mobcount1,mobcount2,mobcount3,mobcount4,itemcount1,itemcount2,itemcount3,itemcount4 FROM character_queststatus WHERE guid = '%u'", GUID_LOPART(m_guid));
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADDAILYQUESTSTATUS,"SELECT quest,time FROM character_queststatus_daily WHERE guid = '%u'", GUID_LOPART(m_guid)); res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADDAILYQUESTSTATUS,"SELECT quest,time FROM character_queststatus_daily WHERE guid = '%u'", GUID_LOPART(m_guid));
@@ -180,6 +180,7 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
std::string name; std::string name;
uint8 race_,class_; uint8 race_,class_;
recv_data >> name; recv_data >> name;
// recheck with known string size // recheck with known string size
@@ -214,6 +215,7 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(class_); ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(class_);
ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(race_); ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(race_);
if( !classEntry || !raceEntry ) if( !classEntry || !raceEntry )
{ {
data << (uint8)CHAR_CREATE_FAILED; data << (uint8)CHAR_CREATE_FAILED;
@@ -607,7 +609,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
pCurrChar->SetRank(0); pCurrChar->SetRank(0);
} }
if (!MapManager::Instance().GetMap(pCurrChar->GetMapId(), pCurrChar)->Add(pCurrChar)) if (!pCurrChar->GetMap()->Add(pCurrChar))
{ {
AreaTrigger const* at = objmgr.GetGoBackTrigger(pCurrChar->GetMapId()); AreaTrigger const* at = objmgr.GetGoBackTrigger(pCurrChar->GetMapId());
if(at) if(at)
@@ -999,35 +1001,35 @@ void WorldSession::HandleDeclinedPlayerNameOpcode(WorldPacket& recv_data)
{ {
uint64 guid; uint64 guid;
CHECK_PACKET_SIZE(recv_data, 8+6); CHECK_PACKET_SIZE(recv_data, 8);
recv_data >> guid; recv_data >> guid;
// not accept declined names for unsupported languages // not accept declined names for unsupported languages
std::string name; std::string name;
if(!objmgr.GetPlayerNameByGUID(guid,name)) if(!objmgr.GetPlayerNameByGUID(guid, name))
{ {
WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT,4+8); WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
data << (uint32)1; data << uint32(1);
data << guid; data << uint64(guid);
SendPacket(&data); SendPacket(&data);
return; return;
} }
std::wstring wname; std::wstring wname;
if(!Utf8toWStr(name,wname)) if(!Utf8toWStr(name, wname))
{ {
WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT,4+8); WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
data << (uint32)1; data << uint32(1);
data << guid; data << uint64(guid);
SendPacket(&data); SendPacket(&data);
return; return;
} }
if(!isCyrillicCharacter(wname[0])) // name already stored as only single alphabet using if(!isCyrillicCharacter(wname[0])) // name already stored as only single alphabet using
{ {
WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT,4+8); WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
data << (uint32)1; data << uint32(1);
data << guid; data << uint64(guid);
SendPacket(&data); SendPacket(&data);
return; return;
} }
@@ -1035,35 +1037,37 @@ void WorldSession::HandleDeclinedPlayerNameOpcode(WorldPacket& recv_data)
std::string name2; std::string name2;
DeclinedName declinedname; DeclinedName declinedname;
CHECK_PACKET_SIZE(recv_data, recv_data.rpos() + 1);
recv_data >> name2; recv_data >> name2;
if(name2!=name) // character have different name if(name2 != name) // character have different name
{ {
WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT,4+8); WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
data << (uint32)1; data << uint32(1);
data << guid; data << uint64(guid);
SendPacket(&data); SendPacket(&data);
return; return;
} }
for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i) for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
{ {
CHECK_PACKET_SIZE(recv_data, recv_data.rpos() + 1);
recv_data >> declinedname.name[i]; recv_data >> declinedname.name[i];
if(!normalizePlayerName(declinedname.name[i])) if(!normalizePlayerName(declinedname.name[i]))
{ {
WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT,4+8); WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
data << (uint32)1; data << uint32(1);
data << guid; data << uint64(guid);
SendPacket(&data); SendPacket(&data);
return; return;
} }
} }
if(!ObjectMgr::CheckDeclinedNames(GetMainPartOfName(wname,0),declinedname)) if(!ObjectMgr::CheckDeclinedNames(GetMainPartOfName(wname, 0), declinedname))
{ {
WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT,4+8); WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
data << (uint32)1; data << uint32(1);
data << guid; data << uint64(guid);
SendPacket(&data); SendPacket(&data);
return; return;
} }
@@ -1074,11 +1078,11 @@ void WorldSession::HandleDeclinedPlayerNameOpcode(WorldPacket& recv_data)
CharacterDatabase.BeginTransaction(); CharacterDatabase.BeginTransaction();
CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid = '%u'", GUID_LOPART(guid)); CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid = '%u'", GUID_LOPART(guid));
CharacterDatabase.PExecute("INSERT INTO character_declinedname (guid, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u','%s','%s','%s','%s','%s')", CharacterDatabase.PExecute("INSERT INTO character_declinedname (guid, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u','%s','%s','%s','%s','%s')",
GUID_LOPART(guid), declinedname.name[0].c_str(),declinedname.name[1].c_str(),declinedname.name[2].c_str(),declinedname.name[3].c_str(),declinedname.name[4].c_str()); GUID_LOPART(guid), declinedname.name[0].c_str(), declinedname.name[1].c_str(), declinedname.name[2].c_str(), declinedname.name[3].c_str(), declinedname.name[4].c_str());
CharacterDatabase.CommitTransaction(); CharacterDatabase.CommitTransaction();
WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT,4+8); WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
data << (uint32)0; // OK data << uint32(0); // OK
data << guid; data << uint64(guid);
SendPacket(&data); SendPacket(&data);
} }
src/game/Pet.cpp
+58 -24
View File
@@ -286,6 +286,11 @@ bool Pet::LoadPetFromDB( Unit* owner, uint32 petentry, uint32 petnumber, bool cu
m_charmInfo->GetActionBarEntry(index)->Type = atol((*iter).c_str()); m_charmInfo->GetActionBarEntry(index)->Type = atol((*iter).c_str());
++iter; ++iter;
m_charmInfo->GetActionBarEntry(index)->SpellOrAction = atol((*iter).c_str()); m_charmInfo->GetActionBarEntry(index)->SpellOrAction = atol((*iter).c_str());
// patch for old data where some spells have ACT_DECIDE but should have ACT_CAST
// so overwrite old state
SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_charmInfo->GetActionBarEntry(index)->SpellOrAction);
if (spellInfo && spellInfo->AttributesEx & SPELL_ATTR_EX_UNAUTOCASTABLE_BY_PET) m_charmInfo->GetActionBarEntry(index)->Type = ACT_CAST;
} }
//init teach spells //init teach spells
@@ -1322,7 +1327,7 @@ void Pet::_LoadAuras(uint32 timediff)
for(int i = UNIT_FIELD_AURA; i <= UNIT_FIELD_AURASTATE; ++i) for(int i = UNIT_FIELD_AURA; i <= UNIT_FIELD_AURASTATE; ++i)
SetUInt32Value(i, 0); SetUInt32Value(i, 0);
QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_index,amount,maxduration,remaintime,remaincharges FROM pet_aura WHERE guid = '%u'",m_charmInfo->GetPetNumber()); QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_index,stackcount,amount,maxduration,remaintime,remaincharges FROM pet_aura WHERE guid = '%u'",m_charmInfo->GetPetNumber());
if(result) if(result)
{ {
@@ -1332,10 +1337,11 @@ void Pet::_LoadAuras(uint32 timediff)
uint64 caster_guid = fields[0].GetUInt64(); uint64 caster_guid = fields[0].GetUInt64();
uint32 spellid = fields[1].GetUInt32(); uint32 spellid = fields[1].GetUInt32();
uint32 effindex = fields[2].GetUInt32(); uint32 effindex = fields[2].GetUInt32();
int32 damage = (int32)fields[3].GetUInt32(); uint32 stackcount= fields[3].GetUInt32();
int32 maxduration = (int32)fields[4].GetUInt32(); int32 damage = (int32)fields[4].GetUInt32();
int32 remaintime = (int32)fields[5].GetUInt32(); int32 maxduration = (int32)fields[5].GetUInt32();
int32 remaincharges = (int32)fields[6].GetUInt32(); int32 remaintime = (int32)fields[6].GetUInt32();
int32 remaincharges = (int32)fields[7].GetUInt32();
SpellEntry const* spellproto = sSpellStore.LookupEntry(spellid); SpellEntry const* spellproto = sSpellStore.LookupEntry(spellid);
if(!spellproto) if(!spellproto)
@@ -1372,6 +1378,8 @@ void Pet::_LoadAuras(uint32 timediff)
if (caster_guid != GetGUID() && IsSingleTargetSpell(spellproto)) if (caster_guid != GetGUID() && IsSingleTargetSpell(spellproto))
continue; continue;
for(uint32 i=0; i<stackcount; i++)
{
Aura* aura = CreateAura(spellproto, effindex, NULL, this, NULL); Aura* aura = CreateAura(spellproto, effindex, NULL, this, NULL);
if(!damage) if(!damage)
@@ -1379,6 +1387,7 @@ void Pet::_LoadAuras(uint32 timediff)
aura->SetLoadedState(caster_guid,damage,maxduration,remaintime,remaincharges); aura->SetLoadedState(caster_guid,damage,maxduration,remaintime,remaincharges);
AddAura(aura); AddAura(aura);
} }
}
while( result->NextRow() ); while( result->NextRow() );
delete result; delete result;
@@ -1390,10 +1399,26 @@ void Pet::_SaveAuras()
CharacterDatabase.PExecute("DELETE FROM pet_aura WHERE guid = '%u'",m_charmInfo->GetPetNumber()); CharacterDatabase.PExecute("DELETE FROM pet_aura WHERE guid = '%u'",m_charmInfo->GetPetNumber());
AuraMap const& auras = GetAuras(); AuraMap const& auras = GetAuras();
for(AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) if (auras.empty())
return;
spellEffectPair lastEffectPair = auras.begin()->first;
uint32 stackCounter = 1;
for(AuraMap::const_iterator itr = auras.begin(); ; ++itr)
{
if(itr == auras.end() || lastEffectPair != itr->first)
{
AuraMap::const_iterator itr2 = itr;
// save previous spellEffectPair to db
itr2--;
SpellEntry const *spellInfo = itr2->second->GetSpellProto();
/// do not save single target auras (unless they were cast by the player)
if (!(itr2->second->GetCasterGUID() != GetGUID() && IsSingleTargetSpell(spellInfo)))
{
if(!itr2->second->IsPassive())
{ {
// skip all auras from spell that apply at cast SPELL_AURA_MOD_SHAPESHIFT or pet area auras. // skip all auras from spell that apply at cast SPELL_AURA_MOD_SHAPESHIFT or pet area auras.
SpellEntry const *spellInfo = itr->second->GetSpellProto();
uint8 i; uint8 i;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_STEALTH || if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_STEALTH ||
@@ -1401,19 +1426,25 @@ void Pet::_SaveAuras()
spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AREA_AURA_PET ) spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AREA_AURA_PET )
break; break;
if (i != 3) if (i == 3)
continue; {
CharacterDatabase.PExecute("INSERT INTO pet_aura (guid,caster_guid,spell,effect_index,stackcount,amount,maxduration,remaintime,remaincharges) "
"VALUES ('%u', '" I64FMTD "', '%u', '%u', '%u', '%d', '%d', '%d', '%d')",
m_charmInfo->GetPetNumber(), itr2->second->GetCasterGUID(),(uint32)itr2->second->GetId(), (uint32)itr2->second->GetEffIndex(), stackCounter, itr2->second->GetModifier()->m_amount,int(itr2->second->GetAuraMaxDuration()),int(itr2->second->GetAuraDuration()),int(itr2->second->m_procCharges));
}
}
}
if(itr == auras.end())
break;
}
if(itr->second->IsPassive()) if (lastEffectPair == itr->first)
continue; stackCounter++;
else
/// do not save single target auras (unless they were cast by the player) {
if (itr->second->GetCasterGUID() != GetGUID() && IsSingleTargetSpell(spellInfo)) lastEffectPair = itr->first;
continue; stackCounter = 1;
}
CharacterDatabase.PExecute("INSERT INTO pet_aura (guid,caster_guid,spell,effect_index,amount,maxduration,remaintime,remaincharges) "
"VALUES ('%u', '" I64FMTD "', '%u', '%u', '%d', '%d', '%d', '%d')",
m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(),(uint32)(*itr).second->GetId(), (uint32)(*itr).second->GetEffIndex(),(*itr).second->GetModifier()->m_amount,int((*itr).second->GetAuraMaxDuration()),int((*itr).second->GetAuraDuration()),int((*itr).second->m_procCharges));
} }
} }
@@ -1434,6 +1465,9 @@ bool Pet::addSpell(uint16 spell_id, uint16 active, PetSpellState state, uint16 s
return false; return false;
} }
// same spells don't have autocast option
if (spellInfo->AttributesEx & SPELL_ATTR_EX_UNAUTOCASTABLE_BY_PET) active = ACT_CAST;
PetSpellMap::iterator itr = m_spells.find(spell_id); PetSpellMap::iterator itr = m_spells.find(spell_id);
if (itr != m_spells.end()) if (itr != m_spells.end())
{ {
@@ -1508,7 +1542,7 @@ bool Pet::addSpell(uint16 spell_id, uint16 active, PetSpellState state, uint16 s
if (IsPassiveSpell(spell_id)) if (IsPassiveSpell(spell_id))
CastSpell(this, spell_id, true); CastSpell(this, spell_id, true);
else if(state == PETSPELL_NEW) else if(state == PETSPELL_NEW)
m_charmInfo->AddSpellToAB(oldspell_id, spell_id); m_charmInfo->AddSpellToAB(oldspell_id, spell_id, active);
if(newspell->active == ACT_ENABLED) if(newspell->active == ACT_ENABLED)
ToggleAutocast(spell_id, true); ToggleAutocast(spell_id, true);
@@ -1658,10 +1692,10 @@ void Pet::ToggleAutocast(uint32 spellid, bool apply)
if(IsPassiveSpell(spellid)) if(IsPassiveSpell(spellid))
return; return;
if(const SpellEntry *tempSpell = GetSpellStore()->LookupEntry(spellid)) //if(const SpellEntry *tempSpell = GetSpellStore()->LookupEntry(spellid))
if(tempSpell->EffectImplicitTargetA[0] != TARGET_ALL_AROUND_CASTER // if(tempSpell->EffectImplicitTargetA[0] != TARGET_ALL_AROUND_CASTER
&& tempSpell->EffectImplicitTargetA[0] != TARGET_CHAIN_DAMAGE) // && tempSpell->EffectImplicitTargetA[0] != TARGET_CHAIN_DAMAGE)
return; // return;
PetSpellMap::const_iterator itr = m_spells.find((uint16)spellid); PetSpellMap::const_iterator itr = m_spells.find((uint16)spellid);
src/game/SharedDefines.h
+1 -1
View File
@@ -248,7 +248,7 @@ enum ItemQualities
#define SPELL_ATTR_EX_UNK14 0x00004000 // 14 #define SPELL_ATTR_EX_UNK14 0x00004000 // 14
#define SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY 0x00008000 // 15 remove auras on immunity #define SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY 0x00008000 // 15 remove auras on immunity
#define SPELL_ATTR_EX_UNAFFECTED_BY_SCHOOL_IMMUNE 0x00010000 // 16 unaffected by school immunity #define SPELL_ATTR_EX_UNAFFECTED_BY_SCHOOL_IMMUNE 0x00010000 // 16 unaffected by school immunity
#define SPELL_ATTR_EX_UNK17 0x00020000 // 17 #define SPELL_ATTR_EX_UNAUTOCASTABLE_BY_PET 0x00020000 // 17
#define SPELL_ATTR_EX_UNK18 0x00040000 // 18 #define SPELL_ATTR_EX_UNK18 0x00040000 // 18
#define SPELL_ATTR_EX_UNK19 0x00080000 // 19 #define SPELL_ATTR_EX_UNK19 0x00080000 // 19
#define SPELL_ATTR_EX_REQ_COMBO_POINTS1 0x00100000 // 20 Req combo points on target #define SPELL_ATTR_EX_REQ_COMBO_POINTS1 0x00100000 // 20 Req combo points on target