Overlooked ObjectMgr changes to reflect group table structure updates. Fixes issue #1046

--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-03-10 16:00:17 +01:00
parent c603afb23e
commit d8fdf47c17
+2 -2
View File
@@ -3405,7 +3405,7 @@ void ObjectMgr::LoadGroups()
group = NULL; group = NULL;
leaderGuid = 0; leaderGuid = 0;
// 2 3 4 1 1 // 2 3 4 1 1
result = CharacterDatabase.Query("SELECT memberGuid, assistant, subgroup, leaderGuid FROM group_member ORDER BY leaderGuid"); result = CharacterDatabase.Query("SELECT memberGuid, memberFlags, subgroup, leaderGuid FROM group_member ORDER BY leaderGuid");
if(!result) if(!result)
{ {
barGoLink bar2( 1 ); barGoLink bar2( 1 );
@@ -3431,7 +3431,7 @@ void ObjectMgr::LoadGroups()
} }
} }
if(!group->LoadMemberFromDB(fields[0].GetUInt32(), fields[2].GetUInt8(), fields[1].GetBool())) if(!group->LoadMemberFromDB(fields[0].GetUInt32(), fields[1].GetUInt8(), fields[2].GetUInt8()))
{ {
sLog.outErrorDb("Incorrect entry in group_member table : member %d cannot be added to player %d's group!", fields[0].GetUInt32(), fields[3].GetUInt32()); sLog.outErrorDb("Incorrect entry in group_member table : member %d cannot be added to player %d's group!", fields[0].GetUInt32(), fields[3].GetUInt32());
CharacterDatabase.PExecute("DELETE FROM group_member WHERE memberGuid = '%d'", fields[0].GetUInt32()); CharacterDatabase.PExecute("DELETE FROM group_member WHERE memberGuid = '%d'", fields[0].GetUInt32());