diff --git a/sql/434/01_characters.sql b/sql/434/01_characters.sql index 0e4398249..483235b5c 100644 --- a/sql/434/01_characters.sql +++ b/sql/434/01_characters.sql @@ -1,10 +1,10 @@ -alter table `characters`.`characters` +alter table `characters` add column `power8` int(10) UNSIGNED DEFAULT '0' NOT NULL after `power7`, add column `power9` int(10) UNSIGNED DEFAULT '0' NOT NULL after `power8`, add column `power10` int(10) UNSIGNED DEFAULT '0' NOT NULL after `power9`, drop column `ammoId`; -alter table `characters`.`character_stats` +alter table `character_stats` add column `maxpower8` int(10) UNSIGNED DEFAULT '0' NOT NULL after `maxpower7`, add column `maxpower9` int(10) UNSIGNED DEFAULT '0' NOT NULL after `maxpower8`, add column `maxpower10` int(10) UNSIGNED DEFAULT '0' NOT NULL after `maxpower9`; diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 339e66050..d25c90fc0 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -2309,7 +2309,7 @@ void AchievementGlobalMgr::SetRealmCompleted(AchievementEntry const* achievement m_allCompletedAchievements.insert(achievement->ID); } -void AchievementGlobalMgr::LoadAchievementCriteriaList() +/*void AchievementGlobalMgr::LoadAchievementCriteriaList() { if (sAchievementCriteriaStore.GetNumRows() == 0) { @@ -2349,7 +2349,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList() sLog.outString(); sLog.outString(">> Loaded %u achievement criteria.", count); -} +}*/ void AchievementGlobalMgr::LoadAchievementReferenceList() { diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h index 1621d98cf..d8ab7b09a 100644 --- a/src/game/AchievementMgr.h +++ b/src/game/AchievementMgr.h @@ -320,7 +320,7 @@ class AchievementGlobalMgr bool IsRealmCompleted(AchievementEntry const* achievement) const; void SetRealmCompleted(AchievementEntry const* achievement); - void LoadAchievementCriteriaList(); + //void LoadAchievementCriteriaList(); void LoadAchievementCriteriaRequirements(); void LoadAchievementReferenceList(); void LoadCompletedAchievements(); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 0dbf78141..7995235ce 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -19386,7 +19386,7 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uin /*if (uint32 extendedCostId = crItem->ExtendedCost) { - ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId); + ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId); if (!iece) { sLog.outError("Item %u have wrong ExtendedCost field value %u", pProto->ItemId, extendedCostId); diff --git a/src/game/World.cpp b/src/game/World.cpp index 9b4ccfdb8..8329995c1 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -1193,7 +1193,7 @@ void World::SetInitialWorldSettings() sLog.outString(); sLog.outString("Loading Achievements..."); sAchievementMgr.LoadAchievementReferenceList(); - sAchievementMgr.LoadAchievementCriteriaList(); + //sAchievementMgr.LoadAchievementCriteriaList(); sAchievementMgr.LoadAchievementCriteriaRequirements(); sAchievementMgr.LoadRewards(); sAchievementMgr.LoadRewardLocales(); diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp index 66171f17f..537d76a50 100644 --- a/src/realmd/AuthSocket.cpp +++ b/src/realmd/AuthSocket.cpp @@ -299,6 +299,7 @@ void AuthSocket::SendProof(Sha1Hash sha) case 11403: // 3.3.2 case 11723: // 3.3.3a case 12340: // 3.3.5a + case 15595: // 4.3.4 default: // or later { sAuthLogonProof_S proof; @@ -954,6 +955,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer& pkt, uint32 acctid) case 11403: // 3.3.2 case 11723: // 3.3.3a case 12340: // 3.3.5a + case 15595: // 4.3.4 default: // and later { pkt << uint32(0); // unused value diff --git a/src/realmd/RealmList.cpp b/src/realmd/RealmList.cpp index 2625a71aa..2b32fc070 100644 --- a/src/realmd/RealmList.cpp +++ b/src/realmd/RealmList.cpp @@ -31,13 +31,14 @@ INSTANTIATE_SINGLETON_1(RealmList); extern DatabaseType LoginDatabase; -// will only support WoW 1.12.1/1.12.2 , WoW:TBC 2.4.3 and official release for WoW:WotLK and later, client builds 10505, 8606, 6005, 5875 +// will only support WoW 1.12.1/1.12.2, WoW:TBC 2.4.3, WoW:WotLK 3.3.5a and official release for WoW:Cataclysm and later, client builds 15595, 10505, 8606, 6005, 5875 // if you need more from old build then add it in cases in realmd sources code // list sorted from high to low build and first build used as low bound for accepted by default range (any > it will accepted by realmd at least) static RealmBuildInfo ExpectedRealmdClientBuilds[] = { - {12340, 3, 3, 5, 'a'}, // highest supported build, also auto accept all above for simplify future supported builds testing + {15595, 4, 3, 4, ' '}, // highest supported build, also auto accept all above for simplify future supported builds testing + {12340, 3, 3, 5, 'a'}, {11723, 3, 3, 3, 'a'}, {11403, 3, 3, 2, ' '}, {11159, 3, 3, 0, 'a'},