aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-06-01 23:06:04 +0200
committerShauren <shauren.trinity@gmail.com>2017-06-01 23:17:11 +0200
commit023d25215574df5463dfe7f11bc996941a5acc2d (patch)
tree9c55cf4d6d6f48c3cb7b7a166ed3f0cfa46dc08d
parented43883160f2bb33f7be64362f32e52ea05e3dd6 (diff)
Revert "Core/Groups: fix wrong query for loading group instance data. canReset attribute was calculated in the wrong way"
This reverts commit 0c1dd398bd80e40961b200494639660d608a3ccf. Closes #19745
-rw-r--r--src/server/game/Groups/GroupMgr.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/server/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp
index 9c5f31155cc..dd64db81873 100644
--- a/src/server/game/Groups/GroupMgr.cpp
+++ b/src/server/game/Groups/GroupMgr.cpp
@@ -201,10 +201,13 @@ void GroupMgr::LoadGroups()
TC_LOG_INFO("server.loading", "Loading Group instance saves...");
{
uint32 oldMSTime = getMSTime();
- // 0 1 2 3 4 5 6
- QueryResult result = CharacterDatabase.Query("SELECT gi.guid, i.map, gi.instance, gi.permanent, i.difficulty, i.resettime, COUNT(g.guid) "
- "FROM group_instance gi INNER JOIN instance i ON gi.instance = i.id "
- "LEFT JOIN character_instance ci LEFT JOIN groups g ON g.leaderGuid = ci.guid ON ci.instance = gi.instance AND ci.permanent = 1 GROUP BY gi.instance ORDER BY gi.guid");
+
+ // 0 1 2 3 4 5
+ QueryResult result = CharacterDatabase.Query("SELECT gi.guid, i.map, gi.instance, gi.permanent, i.difficulty, i.resettime, "
+ // 6
+ "(SELECT COUNT(1) FROM character_instance ci LEFT JOIN groups g ON ci.guid = g.leaderGuid WHERE ci.instance = gi.instance AND ci.permanent = 1 LIMIT 1) "
+ "FROM group_instance gi LEFT JOIN instance i ON gi.instance = i.id ORDER BY guid");
+
if (!result)
{
TC_LOG_INFO("server.loading", ">> Loaded 0 group-instance saves. DB table `group_instance` is empty!");