Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Professions: use the correct value type for selecting archaeology guid based data

Browse Source
This commit is contained in:
Ovahlord
2019-12-06 16:16:36 +01:00
parent 3dc4c6d5bc
commit 5d21f24d36
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Skills/Archaeology/ArchaeologyProjects.cpp
View File

@@ -87,7 +87,7 @@ void Archaeology::RegenerateBranch(uint8 branch)
uint16 project = sArchaeologyMgr->GetNewProject(branch, &_branches[branch], &_completedProjects, _player->GetSkillValue(SKILL_ARCHAEOLOGY));
_branches[branch].Project = project;
CharacterDatabase.PExecute("REPLACE INTO character_archaeology_projects VALUES (%u, %u, %u)", _player->GetGUID(), branch, project);
CharacterDatabase.PExecute("REPLACE INTO character_archaeology_projects VALUES (%u, %u, %u)", _player->GetGUID().GetCounter(), branch, project);
}
void Archaeology::VerifyProjects()
@@ -114,8 +114,7 @@ void Archaeology::VerifyProjects()
void Archaeology::CleanProjects()
{
CharacterDatabase.PExecute("delete from character_archaeology_projects where guid=%u",
_player->GetGUID());
CharacterDatabase.PExecute("delete from character_archaeology_projects where guid=%u", _player->GetGUID().GetCounter());
for (uint8 i = 0; i < MAX_PROJECTS; ++i)
VisualizeBranch(i, 0);
@@ -193,15 +192,14 @@ void Archaeology::CompleteProject(uint16 projectId)
_completedProjects[projectId].first = time(nullptr);
_completedProjects[projectId].second = 1;
CharacterDatabase.PExecute("REPLACE INTO character_archaeology_completed VALUES (%u, %u, %u, 1);",
_player->GetGUID(), projectId, time(nullptr));
CharacterDatabase.PExecute("REPLACE INTO character_archaeology_completed VALUES (%u, %u, %u, 1);", _player->GetGUID().GetCounter(), projectId, time(nullptr));
}
else
{
_completedProjects[projectId].second++;
CharacterDatabase.PExecute("UPDATE character_archaeology_completed SET count=%u WHERE guid=%u and project=%u;",
_completedProjects[projectId].second, _player->GetGUID(), projectId);
_completedProjects[projectId].second, _player->GetGUID().GetCounter(), projectId);
}
_player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_ARCHAEOLOGY_PROJECTS, projectId, 1);

6
src/server/game/Skills/Archaeology/ArchaeologySites.cpp
View File

@@ -41,7 +41,7 @@ enum SurveyBot
void Archaeology::LoadSitesFromDB()
{
QueryResult result = CharacterDatabase.PQuery("SELECT site, type, finds FROM character_archaeology_sites WHERE guid=%u", _player->GetGUID());
QueryResult result = CharacterDatabase.PQuery("SELECT site, type, finds FROM character_archaeology_sites WHERE guid=%u", _player->GetGUID().GetCounter());
if (!result)
return;
@@ -152,7 +152,7 @@ void Archaeology::UseSite()
RegeneratePosition(position, GetContinent());
else
{
CharacterDatabase.PExecute("UPDATE character_archaeology_sites SET finds = %u WHERE site= %u AND guid= %u", _site[position].State, position, _player->GetGUID());
CharacterDatabase.PExecute("UPDATE character_archaeology_sites SET finds = %u WHERE site= %u AND guid= %u", _site[position].State, position, _player->GetGUID().GetCounter());
sArchaeologyMgr->SetSiteCoords(_site[position]);
}
}
@@ -224,7 +224,7 @@ void Archaeology::RegeneratePosition(uint32 position, Continent continent)
uint16 entry = sArchaeologyMgr->GetNewSite(continent, _site, _continentState[continent] == STATE_EXT, _player->getLevel());
SetSite(position, entry);
CharacterDatabase.PExecute("REPLACE INTO character_archaeology_sites values (%u, %u, %u, %u);", _player->GetGUID(), position, entry, _site[position].State);
CharacterDatabase.PExecute("REPLACE INTO character_archaeology_sites values (%u, %u, %u, %u);", _player->GetGUID().GetCounter(), position, entry, _site[position].State);
}
void Archaeology::RegenerateContinent(Continent continent)