Skip to content

Commit

Permalink
[c13065] Fix loot loading problems
Browse files Browse the repository at this point in the history 
Thanks to @RHOPKINS13

Close cmangos/issues#629
  • Loading branch information
@xfurry
xfurry committed Mar 13, 2015
1 parent 0025fc9 commit 25f81fa
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/game/Creature.h
View file
Expand Up @@ -120,8 +120,8 @@ struct CreatureInfo
uint32 DamageSchool;
uint32 MinLootGold;
uint32 MaxLootGold;
uint32 pickpocketLootId;
uint32 LootId;
uint32 PickpocketLootId;
uint32 SkinningLootId;
uint32 KillCredit[MAX_KILL_CREDIT];
uint32 QuestItems[6];
Expand Down
2 changes: 1 addition & 1 deletion src/game/Level3.cpp
View file
Expand Up @@ -4374,7 +4374,7 @@ bool ChatHandler::HandleNpcInfoCommand(char* /*args*/)
PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth());
PSendSysMessage(LANG_NPCINFO_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS), target->GetUInt32Value(UNIT_DYNAMIC_FLAGS), target->getFaction());
PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str());
PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->LootId, cInfo->pickpocketLootId, cInfo->SkinningLootId);
PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->LootId, cInfo->PickpocketLootId, cInfo->SkinningLootId);
PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId());
PSendSysMessage(LANG_NPCINFO_POSITION, float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ()));

Expand Down
2 changes: 1 addition & 1 deletion src/game/LootMgr.cpp
View file
Expand Up @@ -1414,7 +1414,7 @@ void LoadLootTemplates_Pickpocketing()
{
if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
{
if (uint32 lootid = cInfo->pickpocketLootId)
if (uint32 lootid = cInfo->PickpocketLootId)
{
if (ids_set.find(lootid) == ids_set.end())
LootTemplates_Pickpocketing.ReportNotExistedId(lootid);
Expand Down
2 changes: 1 addition & 1 deletion src/game/Player.cpp
View file
Expand Up @@ -8402,7 +8402,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
creature->lootForPickPocketed = true;
loot->clear();

if (uint32 lootid = creatureInfo->pickpocketLootId)
if (uint32 lootid = creatureInfo->PickpocketLootId)
loot->FillLoot(lootid, LootTemplates_Pickpocketing, this, false);

// Generate extra money for pick pocket loot
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
View file
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "13064"
#define REVISION_NR "13065"
#endif // __REVISION_NR_H__

1 comment on commit 25f81fa

@xfurry
Copy link
Member Author

@xfurry xfurry commented on 25f81fa Mar 13, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

poke @virusav

Please fix the YTDB cata errors in DB using this:

DELETE FROM spell_script_target WHERE entry=74758;
DELETE FROM spell_target_position WHERE id IN (70860,84506,84505,70781,70856,70857,70858,70859,70861,84463,88345,88346,88775,90244,90245,26373,65042,64032,
64031,64030,64029,64028,64025,64024,64014);
DELETE FROM achievement_criteria_requirement WHERE criteria_id IN (10403,10568,10570,10439,10582,10598,10404,10583,10599,10719);
DELETE FROM pool_gameobject_template WHERE pool_entry=14602;
DELETE FROM pool_template WHERE entry=14602;
DELETE FROM creature_linking WHERE guid IN (56809,126914,126912,126913);
UPDATE creature SET spawnMask=0 WHERE map IN (713,673,607,672,712);
UPDATE gameobject SET spawnMask=0 WHERE map IN (713,673,607,672,712);

After running the script I still have this error log on cata core: http://paste2.org/fXjWzYhA
I know that there are a few which are because of the core, but most of them are because of DB provider.
So please update the missing / broken loot templates, equipment, creature linking and GO templates.
After you everything is fixed, we can see what needs to be changed in the core in order to handle the exceptions.

Please sign in to comment.